Merge "simpleperf: improve test.py."
am: 12bc7ee848

Change-Id: I9bab0ca51e3272b0aed5a5b305d2474e8f1e86e3