Merge "simpleperf: force testing run-as and app_runner separately." am: da95b3f323 am: 593c70583d

Change-Id: Iea7b1450efdb6ca6fa507eea23bc3d2faaa97840