Snap for 4511918 from 5fc57b0cb3c1e4158e1428cdc019abb18ae960c7 to pi-release

Change-Id: I45195a34353b285f9481a02056783f9070d50086
tree: 7942aa33d298324ae519b207a826889fb799781b
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml