Merge "Fix up MCLinker build to work with LLVM 3.5 (r209713)."