Snap for 4751833 from b67aa362154bb6d1cf7fce391b3f58a66f31269b to pi-release

Change-Id: I81315d121e963054a6dcbc212806b58986178ec3
tree: 1c0316e8b00d80fafef77926c57e5467dbd26ecb
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. build.gradle