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

Change-Id: I1f41ac359ca31b4a81af867037553054f36f5eb5
tree: 5af6995cf939f5bdd36879afa56d32804e290f32
  1. Android.mk
  2. NOTICE.txt
  3. android/
  4. androidx/
  5. com/
  6. source.properties