DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I8d6dc53c5d305b6eac3274eac73cc67a60acfc0c
tree: d3a2136d7fc55ea5d5af83bdaf88793553fe41b4
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. AndroidManifest.xml
  7. CleanSpec.mk