Objective-C. Changes per A. Ballman's comment
for my last patch. // rdar://17631257


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@213185 91177308-0d34-0410-b5e6-96231b3b80d8