Snap for 4728508 from 61a349cfb1c53563e4f9928ed7bdf55dcd4efff5 to pi-release

Change-Id: I79d34083fb60acb8df3d0fb6c76080e89d61be40
tree: 4164ae1d9c557c3accbf32d38554b5e865c121fc
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. PREUPLOAD.cfg