Merge 4205f2f06b03463e0fc99edf8c8576a2631417bd on remote branch

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