Merge "Update Owners"
am: eb46da3c6b

Change-Id: I6bd8b918d040929e734956927836043622ae859e
tree: a297bda44dd87d5dc5d64f65fd6e8db4363881fd
  1. Android.bp
  2. OWNERS
  3. build.gradle
  4. java/
  5. tests/