Merge "simpleperf: fix presubmit test failure."