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

Change-Id: I8f6500a6ae5afbc51a671025635f9018c1b16bbb
tree: e9b22a800adac878aa4d9b60311c9ee66fa23c14
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk