Merge "simpleperf: change the way running cts test."
am: 7efef0e366

Change-Id: I7a11913e1602f6bcd8e244fa68ef48a99427472c