Merge "simpleperf: fix inferno and test content of report.html." am: 001e76be63
am: f9ec53fc3f

Change-Id: I7ab696e12b67a44434c4af90105854d52d5260b5