ObjectiveC migrator: Fixes public buildbot failures,
in my previous patch which was reverted in r187657


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