Various fixes for sync socket implementation.

runtime/bin/socket_android.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #if !defined(DART_IO_DISABLED)
 
 #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 {
 namespace bin {
 
 Socket::Socket(intptr_t fd)
     : ReferenceCounted(), fd_(fd), port_(ILLEGAL_PORT) {}
 
 
 void Socket::SetClosedFd() {
@@ skipping 186 matching lines @@
   }
   return socket;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(HOST_OS_ANDROID)
 
 #endif  // !defined(DART_IO_DISABLED)