Merge be1cad9028dd4de7e9f6a2f19382fac1fb20b5f7 on remote branch

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