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

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