Merge "Bring output of report_sample in line with what perf on my workstation outputs:"