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

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