GitLab

Turns out that there are cases where a process has started exiting (and
thus can't be terminated) but still isn't ready to be reaped.  Thus, a
wait timeout is required in this case as well.

Bug: 757946
Change-Id: Iaf79092a991200c14d321963d9a20bfc191867bc
Reviewed-on: https://chromium-review.googlesource.com/803837Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Brian White <bcwhite@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521001}