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

* commit '3fbb2acde716ea73f00b217ddb42ac4a66e7de39':
  logpersist: switch to pgrep from ps

Change-Id: I259e1c145529695b13789f609a913a1eb2b4dbf2