Snap for 4410151 from a602919c68634f2fac88b9ce8b52fa2d51bb4c26 to pi-release

Change-Id: Idd0df009b3db3c47f24d2eabcee3ee7b7d00d68e
tree: 2633c18f04ad218ce9650bb81bc9931282e87faa
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml