Merge 1ab3ffd00ae1fb3bf71778b5d37b463c086dcd80 on remote branch

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