DO NOT MERGE: Merge Oreo MR1 into master
am: 4f72b7d738  -s ours

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