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

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