Merge a86f458462adf3c73054ba0c7296f8be9d4916fe on remote branch

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