am f465afa8: Merge "Fix broken llvm-rs-cc debugging tests."

* commit 'f465afa8d85d7d27fc2ad2e5d72518973030639f':
  Fix broken llvm-rs-cc debugging tests.