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

Change-Id: I49a72a7abdb3bc5fb4129a6d5317b69d0d8ecc95