Snap for 4821244 from a35eb59a56f01e7b2b3675b58d2839836a8777be to pi-release

Change-Id: Id09d44f38305d964382fdd8d3a53fcaa7cc72f25
tree: cb068f225fc053c7b6ec9c80323ec03729c35f92
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml