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

* origin/swift-3.1-branch:
  [Sema] Teach -Wcast-align to look at the aligned attribute of the declared variables.