am 0e40c373: Merge "Fix up MCLinker build to work with LLVM 3.5 (r209713)."

* commit '0e40c373f017eebf2aa5c4610ca721788b918aa7':
  Fix up MCLinker build to work with LLVM 3.5 (r209713).