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

Change-Id: I8fa668d939b6c45df4590f823b029536895b4574


Trivial merge