Merge "simpleperf: fix --pids option." am: be52e2bb05
am: 1cc3b804f9

Change-Id: I2d7f439d8c44897d2c2061d0828a802c039743c0