Snap for 4887958 from ef8c7b5bc571065a009db1edd9b2188b8e77f068 to pi-dr1-release

Change-Id: I7062e4a2365160df4a88cded173357221177f310
tree: 8b2b172de976ffcc970b02e988260c5ff61dec32
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg