Snap for 4701683 from 987049afd67389eff3c2d837389e9cbf54393227 to pi-release

Change-Id: I32d4e08f101a9637d7d1e702e66f3798a852589f
tree: 022590eff7c76c6051ef7169b372fdae5f576702
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml