Merge "pid: switch to pgrep."
am: 3aa9457410

Change-Id: Ie2cbb889773651c922095a7fa7ae983c8431b1d8