DO NOT MERGE: Merge Oreo MR1 into master am: 2dbbf0c396  -s ours am: 66fd195109
am: d8a4b06e4b  -s ours

Change-Id: I85206feac2738de27c1d123dd0edee96057c2524
tree: b5eb7db8cfafdf3f6d16c3ea7fd9b725a5f183f9
  1. src/
  2. tests/
  3. .classpath
  4. .gitignore
  5. .project
  6. Android.mk
  7. OWNERS
  8. PREUPLOAD.cfg