Snap for 4693621 from 520144f7750b3cefeeb035f13061b19d4d846bb9 to pi-release

Change-Id: Ifb58eca7e48607369ff5418b81374c735152df1f
tree: a1880e5b31f73a31be98f26da66667de44450114
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml