Merge branch 'master' of http://git.int.zerotier.com/ZeroTier/ZeroTierSDK

zerotierone/service/OneService.cpp

@@ -80,8 +80,10 @@ class SqliteNetworkController;
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#if !defined(__ANDROID__)
 #include <ifaddrs.h>
 #endif
+#endif
 
 // Include the right tap device driver for this platform -- add new platforms here
 #ifdef SDK