Snap for 4793185 from 3f0474622152462241a1af8feae0cab1732a549e to pi-release

Change-Id: I5e38ac8307f24263f4b880265924416dffa06393
tree: 5c87ee91f98a05af8deadf1e6c2d68316ab69296
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml