DO NOT MERGE: Merge Oreo MR1 into master

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