Snap for 4696032 from c8828b73f2b64cf78ddabd3cf025feb35315390f to pi-release

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