Add device port unmapping support to forwarder2.

tools/android/forwarder2/device_controller.cc

Index: tools/android/forwarder2/device_controller.cc
diff --git a/tools/android/forwarder2/device_controller.cc b/tools/android/forwarder2/device_controller.cc
index 212b0db5bafde66e35532e11d063ac4db3abf8e9..7338d5a584e6602b2beaa4f80cdc94b27096430a 100644
--- a/tools/android/forwarder2/device_controller.cc
+++ b/tools/android/forwarder2/device_controller.cc
@@ -18,7 +18,7 @@ namespace forwarder2 {
 
 DeviceController::DeviceController(int exit_notifier_fd)
     : exit_notifier_fd_(exit_notifier_fd) {
-  kickstart_adb_socket_.set_exit_notifier_fd(exit_notifier_fd);
+  kickstart_adb_socket_.AddEventFd(exit_notifier_fd);
 }
 
 DeviceController::~DeviceController() {
@@ -60,7 +60,7 @@ void DeviceController::Start() {
     CleanUpDeadListeners();
     scoped_ptr<Socket> socket(new Socket);
     if (!kickstart_adb_socket_.Accept(socket.get())) {
-      if (!kickstart_adb_socket_.exited()) {
+      if (!kickstart_adb_socket_.DidReceiveEvent()) {
         LOG(ERROR) << "Could not Accept DeviceController socket: "
                    << safe_strerror(errno);
       } else {
@@ -69,7 +69,7 @@ void DeviceController::Start() {
       break;
     }
     // So that |socket| doesn't block on read if it has notifications.
-    socket->set_exit_notifier_fd(exit_notifier_fd_);
+    socket->AddEventFd(exit_notifier_fd_);
     int port;
     command::Type command;
     if (!ReadCommand(socket.get(), &port, &command)) {