Tag build swift-DEVELOPMENT-SNAPSHOT-2017-02-20-a
Merge remote-tracking branch 'origin/swift-4.0-branch' into stable

* origin/swift-4.0-branch:
  Revert r294910 and recommit r294861 and r294862 with a target triple to hopefully appease the bots.