DO NOT MERGE: Merge Oreo MR1 into master
am: 77b17c8c8c  -s ours

Change-Id: Ib54601cb188f05bb94ab9634be097cd5d9faf42e
tree: 83c66db45a3934631fb90439e6a65b04056d8c73
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml