am 85f9f764: Merge "Workaround for libportable wait4 implementation."

* commit '85f9f764507761e011fc14398e7ddf08b5d383c5':
  Workaround for libportable wait4 implementation.