Merge "simpleperf: fix finding app's process." am: 5c4dcdb68d
am: 3919e31d85

Change-Id: I5d6988b6ca53afb7a386c15c93c4def724d4a6cd