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

Change-Id: Ib026e6cf03cbde6a943ac14a1f085ddea83207cd