Various fixes for sync socket implementation.

runtime/bin/socket_android.cc

Index: runtime/bin/socket_android.cc
diff --git a/runtime/bin/socket_android.cc b/runtime/bin/socket_android.cc
index 130c7f6828e1aeb66d61def290b1df4ea6902ecc..d4b54002b3d4c183cc267ce27451dbf41ad12923 100644
--- a/runtime/bin/socket_android.cc
+++ b/runtime/bin/socket_android.cc
@@ -7,18 +7,11 @@
 #include "platform/globals.h"
 #if defined(HOST_OS_ANDROID)
 
+#include "bin/socket.h"
+
 #include <errno.h>        // NOLINT
-#include <netinet/tcp.h>  // NOLINT
-#include <stdio.h>        // NOLINT
-#include <stdlib.h>       // NOLINT
-#include <string.h>       // NOLINT
-#include <sys/stat.h>     // NOLINT
-#include <unistd.h>       // NOLINT
 
 #include "bin/fdutils.h"
-#include "bin/file.h"
-#include "bin/socket.h"
-#include "bin/socket_base_android.h"
 #include "platform/signal_blocker.h"
 
 namespace dart {