patch for taking notice of UPNP_USE_RWLOCK flag in threadutil

By "Carl Benson" <carl.benson@windriver.com>:

I had to do some modifications myself though, because the Android
build system insists on having a file named "util.h" taking precedence
in its include path, libupnp gets confused because of the same filename
in upnp/src/inc/util.h

(hand cherry picked from commit 8e846368e0)

upnp/src/genlib/miniserver/miniserver.c

@@ -57,7 +57,7 @@
 #include "ThreadPool.h"
 #include "unixutil.h" /* for socklen_t, EAFNOSUPPORT */
 #include "upnpapi.h"
-#include "util.h"
+#include "upnputil.h"
 
 
 #include <assert.h>