DO NOT MERGE: Merge Oreo MR1 into master am: a4739f3ddd  -s ours
am: 647a92f42b

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