Obj-C/NeXT: Update and reapply 108847, now that changes are more baked.

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