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

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