Merge 63b9af5089ad5ef839c6e46c02bdb54b8198e5f2 on remote branch

Change-Id: I9d80cbe7862b5c7715ad166b01949fc1546bc946
tree: 6a5149c9145464e964b2979b708a3e160415bf06
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags