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

Change-Id: Ie59796139208582d7a79259d32860015ab5fe054