Merge 13a01ae95fc37d4229f916a612575a1b356b9f50 on remote branch

Change-Id: I1c40731bfc82abb310ea4432915098df90aad140
tree: 554ec4d149ef2f2c8466b6b9de0aa8ad37567ca6
  1. java/
  2. tests/
  3. .gitignore
  4. Android.bp