Snap for 4793706 from 3403eaae86008c49c3363bd79a941a80fb931e38 to pi-release

Change-Id: If1330fce0cc86f1f2356ac7f90439d3a35cc9c36
tree: e10c0cb4a9ff4f1d100ba668a424729c3e672670
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. AndroidManifest.xml
  7. CleanSpec.mk