am 334c6f83: Merge "Fix MCLinker builds with clang."

* commit '334c6f83c1265eabd58ac7c8b860898038831eab':
  Fix MCLinker builds with clang.