Merge Android Pie into master am: e1a0cd9a2d
am: b3f1de5efc

Change-Id: I79561ab1236424fab76d0f8a861b24b9705be6eb
tree: 4624ea73151b8edae258f82fc4f9790bfd0c2f70
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. src/