Update from https://crrev.com/333737

tools/android/forwarder2/host_forwarder_main.cc

Index: tools/android/forwarder2/host_forwarder_main.cc
diff --git a/tools/android/forwarder2/host_forwarder_main.cc b/tools/android/forwarder2/host_forwarder_main.cc
index f5d8e2f85d89c6d4849b6539aff94aa9c41919d9..16a7b512990845dd66917a24abf49120cab47aaa 100644
--- a/tools/android/forwarder2/host_forwarder_main.cc
+++ b/tools/android/forwarder2/host_forwarder_main.cc
@@ -28,7 +28,6 @@
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/pickle.h"
-#include "base/safe_strerror_posix.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
@@ -332,8 +331,8 @@ class ServerDelegate : public Daemon::ServerDelegate {
       has_failed_ = true;
       return;
     }
-    const Pickle command_pickle(buf, bytes_read);
-    PickleIterator pickle_it(command_pickle);
+    const base::Pickle command_pickle(buf, bytes_read);
+    base::PickleIterator pickle_it(command_pickle);
     std::string device_serial;
     CHECK(pickle_it.ReadString(&device_serial));
     int device_port;
@@ -358,10 +357,8 @@ class ServerDelegate : public Daemon::ServerDelegate {
 
 class ClientDelegate : public Daemon::ClientDelegate {
  public:
-  ClientDelegate(const Pickle& command_pickle)
-      : command_pickle_(command_pickle),
-        has_failed_(false) {
-  }
+  ClientDelegate(const base::Pickle& command_pickle)
+      : command_pickle_(command_pickle), has_failed_(false) {}
 
   bool has_failed() const { return has_failed_; }
 
@@ -387,7 +384,7 @@ class ClientDelegate : public Daemon::ClientDelegate {
   }
 
  private:
-  const Pickle command_pickle_;
+  const base::Pickle command_pickle_;
   bool has_failed_;
 };
 
@@ -419,7 +416,7 @@ int RunHostForwarder(int argc, char** argv) {
   std::string adb_path = "adb";
   bool kill_server = false;
 
-  Pickle pickle;
+  base::Pickle pickle;
   pickle.WriteString(
       cmd_line.HasSwitch("serial-id") ?
           cmd_line.GetSwitchValueASCII("serial-id") : std::string());