Merge Android Pie into master
am: 2ed4e2dd77

Change-Id: I019ca74c550824fa4d49c918133e86604a415af1
tree: 97cd734f960bfdac84884909da00cc46159b83de
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml