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

Change-Id: Ib1dc31e0972480eeb9fcd739283f2c2f92addf38