Merge "simpleperf: fix test on APCT."