Merge Android Pie into master am: 141f2cbca5
am: 427b350406

Change-Id: Id6c6cc82f9024523f45859e00106f1dd84e3cb5c
tree: 777342afeaf7b68152f996fc9c5a8f5d7dec010e
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml