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

Change-Id: Ie0de0e25eb8c6cb1cfbf39b8576854727bc59df3
tree: 37abba8e242d359b2ec697d0f8064ba963c5039b
  1. res/
  2. src/
  3. .gitignore
  4. Android.mk
  5. MANIFEST.mf
  6. OWNERS
  7. README
  8. README.txt