Snap for 4818837 from 7123096bf8d2f7e059b6863d7b817c6202d6a8c1 to pi-release

Change-Id: I3aa5e921e681123147d60484477a622d98d5d881
tree: 502cb06b644c260cbc79ad671945811b067e7dc5
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml