Merge 465280fda78d392e82749a822907c050e138258b on remote branch

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