DO NOT MERGE: Merge Oreo MR1 into master
am: f1cd14ca81  -s ours

Change-Id: Ic6b8a7a675d2b4a974057edd33f7686422a8f0eb
tree: 5e6f4c130d0aadccaf29c955b3c968dc3a7b29f5
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml