Merge 09a19b640d7052189ef825a464b858eac23ff836 on remote branch

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