Merge "simpleperf: fix presubmit test." am: 18f8a1a981 am: cf39b5ee30 am: 58bcdef9d1

Change-Id: Ibf96bb0b94590d36484586c4d1dea46b1a7c123b