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

Change-Id: Id915fae598b6538f2a9e6ccb6454bdb7e075900e