Snap for 4824048 from 23a06a15ae6b5864822150b35be3a197790b026a to pi-release

Change-Id: I39e0aa3161ecb7d285868b3b8ccc8c717353d402
tree: 8b90e4c38b8a2dd846f6add8870b56b7b7e5675a
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml