Merge "pid: switch to pgrep." am: 3aa9457410 am: 3140c7e495 am: e7e7d31b2b
am: 8ca04cddb5

Change-Id: I5e442229320fda316887c0896af7ee94f20a7f76