Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d895e88843  -s ours
am: 5e461196ee

Change-Id: I9f62de31f83a7001f613404176d405c54aae17e0
tree: b986af08c79a2f70c8e96f69b38ed8b0d5dd884c
  1. camera2/
  2. common/
  3. framesequence/
  4. photoviewer/
  5. widget/
  6. CleanSpec.mk
  7. OWNERS