Merge "simpleperf: change the way running cts tests." am: 9bc17045b0
am: 36caf047e2

Change-Id: I3ffbac68c35a641a263eb9047d14c96cb36ee196