Snap for 4765531 from 95038d1abf9a681307398b6f6a74f7914b7267f3 to pi-release

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