am 2ead849b: am 0c5907b3: am 2f5fa0be: Merge "ndk: Fix wait4() declarations"

* commit '2ead849b894c976a25117c0c31cd76d3242f9933':
  ndk: Fix wait4() declarations