DO NOT MERGE: Merge Oreo MR1 into master

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