Merge "simpleperf: fix inferno and test content of report.html."