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

* commit 'f05c9f97b39d4d17658577416dcc16d85c7582db':
  Workaround for libportable wait4 implementation.