Snap for 4662252 from 2e6c20fc2c41b120765cdfbd643ac67428cff940 to pi-release

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