Merge Android Pie into master
am: e1a0cd9a2d

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