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

Change-Id: I33de2b1ee388029e360a84df04b75265289d2f70


Trivial merge