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

Change-Id: Ib611616632d303f044a1aaba685185dca9e1d846