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

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