Merge Android Pie into master am: 4e748fbaae
am: 1a38356e46

Change-Id: I0243d4ecfc6bd8d613098a6e974ba0ac4399bed0
tree: 3b22dfc8ae6cd9843b518ae65c218750bb94c230
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. AndroidManifest.xml
  7. CleanSpec.mk