Merge bfb0d7b8254171df3a821be586d59b0931815179 on remote branch

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