Merge Android Pie into master
am: d777b14338

Change-Id: I02ef88878a18e89336deb511cf2d43d953785fd2
tree: cb068f225fc053c7b6ec9c80323ec03729c35f92
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml