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

Change-Id: I201905a66287b964d1ae9ad5fbb472b3e5b998cb