Merge "simpleperf: speed up inferno." am: 3688a26a56
am: 31067bc06d

Change-Id: Ifc947dfb17ecda043b220956fa21854beaf51049