Snap for 4736748 from fa439b227052815d0f95c60d9ba834b53d730c90 to pi-release

Change-Id: Ie1d2c1f5a533430aaadc7d82beb107f0a72c556b
tree: 52f37694f2a5021c6c03567f02e78041197c1cce
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml