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

Change-Id: Id6a9bb7e96f35ad18a2f64cf48b8eeb20ffb13ad