Merge 0d42eeced623df86d554abab0f35cf7bdd47b48d on remote branch

Change-Id: I2b5685cb11ae26e78ebd98fff104babbd2eaaa12
tree: b604848d4716b964d68cd9a1114d7febbd772328
  1. build/
  2. java/
  3. javatests/
  4. tools/
  5. Android.bp
  6. OWNERS
  7. PREUPLOAD.cfg
  8. TEST_MAPPING