Merge a1163e2a3aa35f2310979b756b2b14219e67d745 on remote branch

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