Merge 4f101bcc76dc7fee790075ec2683768ab2272d2f on remote branch

Change-Id: I42e554fb2d523b2af16ddbd024d24ecb064076a5
tree: b62c1cc1ef9030e7d77c00877ab5583ec5115bf5
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg