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

* origin/swift-4.0-branch:
  Fix PR31843: Clang-4.0 crashes/assert while evaluating __builtin_object_size