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

Change-Id: I3ca77fa284f46e9c78341617fc5181b045677639
tree: 19f491136da82654dff0b78aeb7b8cecacce2825
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk