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

Change-Id: I48ebf5f59b2b8dfcbcefff67aabb45ea69a11a30