Resolved merge error with r172323 (llvm::X -> X)

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