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

Change-Id: Id089fb511afbd37d10478583052f8e5016b77c70