Merge 690276ae21518bcb1dc324fe11df8ce0e140d210 on remote branch

Change-Id: Ice2d3667f2a9e2e4c851d04954a4b986eaadf848
tree: 2f0eacadf414aaf76d70f3d87357d5afc77abbf8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS