Merge pull request #1528 from StephenCWills/android-miniupnpc

[Android] Fix include for miniupnpc

osdep/PortMapper.cpp

@@ -47,14 +47,9 @@
 #include <miniupnpc/miniupnpc.h>
 #include <miniupnpc/upnpcommands.h>
 #else
-#ifdef __ANDROID__
-#include "miniupnpc.h"
-#include "upnpcommands.h"
-#else
 #include "../ext/miniupnpc/miniupnpc.h"
 #include "../ext/miniupnpc/upnpcommands.h"
 #endif
-#endif
 
 #ifdef ZT_USE_SYSTEM_NATPMP
 #include <natpmp.h>