Merge 10952656

Merged-In: Ie66a10c0261117d400acb8858cb6236138dc29df
Change-Id: Id2853e31ab35e5019611ac203b0b8ff4d0e8af32
tree: 949ef3df623e357b6517d55f1beb32be24cd4886
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.bp
  6. AndroidManifest.xml
  7. OWNERS
  8. PREUPLOAD.cfg