Snap for 4821244 from 1821b4d0da5c287e1c06b7d6367ae6141b996081 to pi-release

Change-Id: Id0cec1912d394b058d6266f6996b9df0ccf11646
tree: f8c83946e0b2bafc93559e5e461ddf6988e96418
  1. libs/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg