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

Change-Id: I0e5f01cad990d3808a7c0f7a6aa792e5d36b7ec8