Merge 6e64c343626891eb8f7f0375bd2a92c95f7689a1 on remote branch

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