Merge "ndk: Fix wait4() declarations"