Merge "Workaround for libportable wait4 implementation."
diff --git a/ndk/sources/android/libportable/arch-mips/waitpid.c b/ndk/sources/android/libportable/arch-mips/waitpid.c
index bbf0a8a..f1d2bcf 100644
--- a/ndk/sources/android/libportable/arch-mips/waitpid.c
+++ b/ndk/sources/android/libportable/arch-mips/waitpid.c
@@ -104,6 +104,11 @@
     return rv;
 }
 
+// FIXME: WORKAROUND after Android wait4 has been implemented
+pid_t REAL(wait4)(pid_t p, int *s, int o, struct rusage *r) {
+  extern pid_t  __wait4(pid_t, int *, int, struct rusage *);
+  return __wait4(p,s,o,r);
+}
 
 pid_t WRAP(wait4)(pid_t pid, int *status, int options, struct rusage *rusage)
 {