Snap for 4496165 from 7c92772e84296badcdf3659988b1702fa6ba6b0e to pi-release

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