Merge 10952656

Merged-In: Ibc2ad5e4610da4617d3a9bac07bb985eb0785fdb
Change-Id: I6c53f585e7b4a3a04f71309b1cee37d58d419a60
tree: 11a227cb69e696eaa0a0b8adae487f4555840df3
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS