Merge "simpleperf: force testing run-as and app_runner separately."