Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 5a0ca15349  -s ours am: 969a7ca58b
am: 975d17c1e3  -s ours

Change-Id: I3464e9a90f7aa0a07811f8c8e609ebfe53c6de73
tree: 34bf632e48b0d5de6882243540c144e6e85593c6
  1. android/
  2. dist/
  3. Android.bp
  4. CleanSpec.mk
  5. OWNERS
  6. README.version