Snap for 4638586 from d01a622a0ec434851707b72826669f6079cfce05 to pi-release

Change-Id: Ic003134d6a7d868cb624fffda882aaf5c1f65819
tree: 428a13e3c7d951c014000838c47423fd40032eb8
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml