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

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