Snap for 4698807 from 497ca45d8744ba0bd17d802c1dff7410558989e7 to pi-release

Change-Id: Ic30779c1b8ff8bf2b2b7ab26b19daccd78aa602d
tree: b051f37127cf86189bb35a015c5825439e5bdc3e
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags