Merge "simpleperf: improve test.py." am: 12bc7ee848 am: 005fc035cb am: 3f5f725466
am: 715a32d7cf

Change-Id: I9d0be3095839f31089f5f75e8641ea2f8bb89abe