This is a partial revert of b4537c3f51 based on the discussion in https://reviews.llvm.org/D101194. Rather than using the getMultiarchTriple, we use the getTripleString.
b4537c3f51