Merge "simpleperf: fix presubmit test after OpenCSD update."