Merge 10952656

Merged-In: I4bfb0abf31816ade2b34528d9e946ef86fb6e028
Change-Id: Iab42e5e106e2e5df2f0eaed553c319e0e8a5c07c
tree: 49e12878ff22c23d42ddc65cb217fc450cd6e6d5
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg