This addresses #17456 and also fixes the --metrics-file argument that Hadrian passes to the testsuite driver.