Snap for 4620899 from 4d9cd4b42d4426fa5d7152d0477bddb888b88f29 to pi-release

Change-Id: I7b9d69e88e44f3515d1ff3f6b3a23c7f9f154830
tree: c07f0fefa89aef148fa473b99acd2372b27e2c4b
  1. java/
  2. tests/
  3. Android.mk
  4. build.gradle