Snap for 4517567 from 221681a5e6cf67ee25af900adeb6bdab27dfef2c to pi-release

Change-Id: Ied302bae482cd1b55150aaa32850003edc8f7198
tree: b847776f6317929036c446bc8fc8a671dfbc6ecf
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags