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