Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 3cfcfbbc81  -s ours
am: 6ca65f4f11

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