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

Change-Id: Ib87ed9843313e5ba76ccae32161ed5719615fa55


Trivial merge