Update from https://crrev.com/315085

tools/android/forwarder2/device_forwarder_main.cc

Index: tools/android/forwarder2/device_forwarder_main.cc
diff --git a/tools/android/forwarder2/device_forwarder_main.cc b/tools/android/forwarder2/device_forwarder_main.cc
index c215efa6b3c89af57f73ffd8a0ceddb76d76f2c7..8b5df26ccb55249b2bfc6045689441e0eea4eaec 100644
--- a/tools/android/forwarder2/device_forwarder_main.cc
+++ b/tools/android/forwarder2/device_forwarder_main.cc
@@ -48,7 +48,7 @@ class ServerDelegate : public Daemon::ServerDelegate {
  public:
   ServerDelegate() : initialized_(false) {}
 
-  virtual ~ServerDelegate() {
+  ~ServerDelegate() override {
     if (!controller_thread_.get())
       return;
     // The DeviceController instance, if any, is constructed on the controller
@@ -68,7 +68,7 @@ class ServerDelegate : public Daemon::ServerDelegate {
   }
 
   // Daemon::ServerDelegate:
-  virtual void Init() override {
+  void Init() override {
     DCHECK(!g_notifier);
     g_notifier = new forwarder2::PipeNotifier();
     signal(SIGTERM, KillHandler);
@@ -77,7 +77,7 @@ class ServerDelegate : public Daemon::ServerDelegate {
     controller_thread_->Start();
   }
 
-  virtual void OnClientConnected(scoped_ptr<Socket> client_socket) override {
+  void OnClientConnected(scoped_ptr<Socket> client_socket) override {
     if (initialized_) {
       client_socket->WriteString("OK");
       return;
@@ -119,7 +119,7 @@ class ClientDelegate : public Daemon::ClientDelegate {
   bool has_failed() const { return has_failed_; }
 
   // Daemon::ClientDelegate:
-  virtual void OnDaemonReady(Socket* daemon_socket) override {
+  void OnDaemonReady(Socket* daemon_socket) override {
     char buf[kBufSize];
     const int bytes_read = daemon_socket->Read(
         buf, sizeof(buf) - 1 /* leave space for null terminator */);