Merge Android Pie into master

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