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

Change-Id: I0917014e1a95f61bfe2d7103c57dfa4cbba7d254
tree: cd614a95db992f2489e7b78e9e72b3a3439f27a1
  1. android/
  2. com/
  3. Android.mk
  4. NOTICE.txt
  5. source.properties