DO NOT MERGE: Merge Oreo MR1 into master am: 41ee806c7f  -s ours
am: 568490329d

Change-Id: I66a08b7f89f6d7c18af8b70dc29cf7f8ce6bb455
tree: 0525a31ae05b46b580f350a806d3bd7a22dbd4af
  1. msm8998/
  2. Android.mk