Snap for 4620899 from ce99c4d868dfe87288f16c752dd544883976581d to pi-release

Change-Id: I7d5a696c5b770e442812eb6a4c904065a197cda3
tree: 73f06fd8d545a3e8d5fc5e6b88cedf3bded2d125
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml