Merge "Fix a few Clang assertions thrown by llvm-rs-cc"