Snap for 4725392 from e9e7d638c33aa4ee2afda0ae9ee613d512586660 to pi-release

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