Merge Android Pie into master

Bug: 112104996
Change-Id: I25b5b842e8e66812ad8fa5b480cddd18113fc7d1
tree: 7138808c3bc4125da3e9f77f8005ff42974c2d1e
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml