Merge "Fix broken llvm-rs-cc debugging tests."