Use a direct include of strings headers in base/.

base/os_compat_android.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 "base/os_compat_android.h"
 
 #include <asm/unistd.h>
 #include <errno.h>
 #include <math.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
 #include <time64.h>
 
 #include "base/rand_util.h"
-#include "base/stringprintf.h"
 #include "base/strings/string_piece.h"
+#include "base/strings/stringprintf.h"
 
 extern "C" {
 // There is no futimes() avaiable in Bionic, so we provide our own
 // implementation until it is there.
 int futimes(int fd, const struct timeval tv[2]) {
   if (tv == NULL)
     return syscall(__NR_utimensat, fd, NULL, NULL, 0);
 
   if (tv[0].tv_usec < 0 || tv[0].tv_usec >= 1000000 ||
       tv[1].tv_usec < 0 || tv[1].tv_usec >= 1000000) {
@@ skipping 134 matching lines @@
       // The directory doesn't exist, but an error occured
       return NULL;
     }
   }
 
   // We reached the max number of tries.
   return NULL;
 }
 
 }  // extern "C"