Merge d13b7a26ec04f18da2e91f5ed760ec8ee5d0608a on remote branch

Change-Id: I618bfd598df4c83c4a684d8b953b1a005c3e20d2
tree: 07cd25392b7786902b068dfad281f8ae50292c53
  1. java/
  2. tests/
  3. Android.bp
  4. build.gradle
  5. OWNERS