Snap for 4531101 from a1e3feb9723f4eec03458059a03783b944b14a5f to pi-release

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