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

* origin/swift-3.0-branch:
  clang/test/Modules/prebuilt-module.m: Prune "-triple" to fix a configuration mismatch.