Merge "logpersist: switch to pgrep from ps" am: 68285c0033 am: b749a0c02f
am: 8739660239

* commit '873966023961be5193583a144ba401b6650cddff':
  logpersist: switch to pgrep from ps

Change-Id: Ie4ab24b41006d2be700e73893d8b7ed9be4d5642