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

* origin/swift-3.1-branch:
  [API Notes] Enable support for overriding the types of declarations.
  [API Notes] Add support for expressing the types of entities.