DO NOT MERGE: Sparse resources fixes am: ae793c389b -s ours am: ce25f76fbb -s ours
authorKantoch <marcin.kantoch@mobica.com>
Fri, 9 Feb 2018 19:10:51 +0000 (19:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Feb 2018 19:10:51 +0000 (19:10 +0000)
am: ca8c87afa7

Change-Id: Ib7913848676c54821d744f8a8a06e1d645aad494


Trivial merge