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

Change-Id: I4a08df9d8f8f477f05e463a47aea8fe3ce756c3e
tree: a38f8a320f3b3ae3e7cdb7e2654995f9b551c77a
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk