Merge "simpleperf: fix test.py on x86/x86_64."