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

* origin/swift-3.1-branch:
  Remove basic block label in test case
  Specify a target cpu in test case