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

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