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

Change-Id: I1dfb939e095e1eb176984306262018cabe4915b3