DO NOT MERGE: Merge Oreo MR1 into master am: f52232a5fd  -s ours
am: 46e31ee1b7

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