Merge Android Pie into master

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