Merge 24c5280a56492829d1b420109e7029887a0f5aa8 on remote branch

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