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

* origin/swift-3.0-branch:
  [arcmt/objcmt] Fix ParentMap crash with invalid code.