Merge 411ff1b85d94fa970b8d19ded026ab53ba41d1f7 on remote branch

Change-Id: Ic3b5266604a4ebba75faf77190f9c07115d0c576
tree: 67d2f8ff3ba8973cad602190a5619ac840ca9fbb
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS