Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 841f1b3694  -s ours
am: 4bc1a01bc1

Change-Id: Ib1a7f075c93d08598d9d8861986606528dc29583
tree: 8c74618381296dd8a887d1db8cd7e84e5a5092af
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml