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

Change-Id: Ie2068adc6d8e06ab0bb1c99d2b3bbb9ac42bc11a