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

* origin/swift-4.0-branch:
  Revert "Modules: Use a PCMCache to manage memory buffers"
  Revert "[Modules] Fallback to building the module if a timeout occurs"