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

Change-Id: I71b7aba0868f1150c250d6b484844ea54f5d828f