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

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