Snap for 4620899 from 39c34ce36a2debcd92b288daf26a33d560bc23cd to pi-release

Change-Id: I109ea0b594d5fb96836ce1b8b8ee8d608fda45ae
tree: 88d719b1e7d0ed48172afe030ccd62e6a2f976f0
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml