Snap for 4765531 from d5a7cb14fa1e82f909f2122b586cc875fbbe4107 to pi-release

Change-Id: Ibd0253370d16800e50a25d59e88889a5b0bdf5dd
tree: c37746aa6b85d67c4ee982b47d9097b5fabee5c0
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml