Snap for 4496165 from ba9f8ead337c26a0f03b9b8c5c5eac6ec94eabf4 to pi-release

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