Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 9308120bc2  -s ours am: 0a84d3e6c5
am: 54c3ef110f  -s ours

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