Merge "simpleperf: fix presubmit test failure." am: c9ada9f419

Change-Id: I4ffdbd00a3a00f8137dbb4d5cf37378604b8cd96