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

* commit '293c746bdc3158fcc6221ec6a33aedfca2d07cb6':
  Workaround for libportable wait4 implementation.