ObjectiveC migrator. Fixes a bug when protocol
conformance is inferred. // rdar://15515206


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