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

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