Merge bf871a98a1576b29f4a12c0f6d78b8d24d7732a6 on remote branch

Change-Id: Id6070997e99fee0bd99e693b860f9e29338343f5
tree: 7a1154105200e9f51a2203f716d3ff5f9fd5ae30
  1. java/
  2. tests/
  3. .gitignore
  4. Android.bp
  5. TEST_MAPPING