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:44 +0000 (19:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Feb 2018 19:10:44 +0000 (19:10 +0000)
am: fe93d4f83c  -s ours

Change-Id: I1a12b353d8fbbb6a9da82e31e373e1155cebfe77


Trivial merge