Snap for 5180536 from b8c3b61022636c880f4e5a5e6a71430552025f98 to pi-platform-release

Change-Id: Icc5d32680bf08d75f01937a71eb845b89018cce6
tree: f98025f1e9a0a59253cf73cf4f1defb4d80bf172
  1. java/
  2. tests/
  3. Android.mk