Snap for 4818534 from f364a0f31b22d32a113e8c63f3f9dbd23622c270 to pi-release

Change-Id: Ib094e1a42cd3b4462014a7a68df262c8ddbae54d
tree: 88e6e947a6e1b647144bc707d91c8021d6e47630
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml