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

Change-Id: I0509db08d888690bb0b334840b8b62211095a9e8