Merge 31069fc482fba28646cee312f474f75fbed023a4 on remote branch

Change-Id: Ic9c30a79f502892d8fe89dbf9d68712b76ee2d2f
tree: 9981363a885e8eb64990d64091de3e5a45719543
  1. java/
  2. tests/
  3. .gitignore
  4. Android.bp