Merge 0d7d7a5f2ad2a9bbe7ddea4cc177386f2190183b on remote branch

Change-Id: I1c2ec4b979d5b94ee7955ab36afd7a3ef24a45f9
tree: eb3870ac43bae9e3db4324013392a59aa206c8e6
  1. java/
  2. tests/
  3. .gitignore
  4. Android.bp