Merge Android Pie into master am: e1a0cd9a2d am: b3f1de5efc
am: 0d51025d26

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