Merge "Workaround for libportable wait4 implementation."