Merge 624a8d65a24d9103ec96d8e1c245a524d51825c5 on remote branch

Change-Id: I11f2e4bbf867e85e7bbf3708b6f75bb3f13ec52a
tree: 32774c7a7d913fb26310261782a339e1eebc8ecb
  1. proto/
  2. res/
  3. src/
  4. tests/
  5. Android.bp
  6. AndroidManifest.xml
  7. OWNERS
  8. proguard.flags