DO NOT MERGE: Merge Oreo MR1 into master am: b070b0f331  -s ours
am: fb625e871e

Change-Id: I2067479ec161d9643ab6a055c4a096e9dcf81eed
tree: c979f6147a99362f63ed092199ee2c06cd56556a
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE