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

Change-Id: I4546e5e2c77e4ef3c72e1cfbf02400b1f9517de3