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

Change-Id: I528c1a63e926c8cb7f992f7eadeb0ee2895ff4da
tree: cf065e31f21d3f78bf6d4563c76821558bac3375
  1. proto/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml