Merge remote-tracking branch 'origin/swift-3.1-branch' into stable

* origin/swift-3.1-branch:
  Fixup test/Driver/opt-record.c for nvptx pointer size
  Add an option to save the backend-produced YAML optimization record to a file