DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: If9299eb3f4f67e49af57ee7c381617afc3f02720
tree: 5e6f4c130d0aadccaf29c955b3c968dc3a7b29f5
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml