Merge "simpleperf: improve test.py."