Upstream android file related code.

base/sys_info_posix.cc

Index: base/sys_info_posix.cc
diff --git a/base/sys_info_posix.cc b/base/sys_info_posix.cc
index d635eb4ada73c98e57f8b61547e396d0daf0ce28..a6b88a82a5d7d2b39e15c23d0e45849f708ce2f0 100644
--- a/base/sys_info_posix.cc
+++ b/base/sys_info_posix.cc
@@ -7,8 +7,6 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/param.h>
-#include <sys/statvfs.h>
-#include <sys/sysctl.h>
 #include <sys/utsname.h>
 #include <unistd.h>
 
@@ -17,6 +15,14 @@
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 
+#if defined(OS_ANDROID)
+#include <sys/vfs.h>
+#define statvfs statfs  // Android uses a statvfs-like statfs struct and call.
+#else
+#include <sys/statvfs.h>
+#include <sys/sysctl.h>
+#endif
+
 namespace base {
 
 #if !defined(OS_OPENBSD)