am 28ed3fe8: am ff156269: Merge "Fix a few Clang assertions thrown by llvm-rs-cc"

* commit '28ed3fe88c155aab2d34494b2c9b1e4f19caaffe':
  Fix a few Clang assertions thrown by llvm-rs-cc