Merge "simpleperf: fix --app option for multiprocess apps." am: 5324d11761 am: 25ae641a7d
am: 09fcf7d9dc

Change-Id: I2fb90408e7c73a2a68f2b7af539edfe559822327