Minor fixes for android test/tools.

tools/android/common/daemon.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/android/common/daemon.h"
 
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 
 namespace {
 
-const char kNoSpawnDaemon[] = "D";
+const char kNoSpawnDaemon[] = "no-spawn-daemon";
 
 int g_exit_status = 0;
 
 void Exit(int unused) {
   _exit(g_exit_status);
 }
 
 void CloseFileDescriptor(int fd) {
   int old_errno = errno;
   close(fd);
@@ skipping 37 matching lines @@
 
   // Close the standard input and outputs, otherwise the process may block
   // adbd when the shell exits.
   // Comment out these lines if you want to see outputs for debugging.
   CloseFileDescriptor(0);
   CloseFileDescriptor(1);
   CloseFileDescriptor(2);
 }
 
 }  // namespace tools