Upstream android string implementation etc.

base/string_util.cc

Index: base/string_util.cc
diff --git a/base/string_util.cc b/base/string_util.cc
index 31c5e1ac626fd795bb6a21946d97b4a0c34dfa0f..4757a85a0e6df0c79a70682005473ac9b6206463 100644
--- a/base/string_util.cc
+++ b/base/string_util.cc
@@ -513,6 +513,8 @@ bool LowerCaseEqualsASCII(string16::const_iterator a_begin,
 }
 #endif
 
+// TODO(port): Resolve wchar_t/iterator issues that require OS_ANDROID here.
+#if !defined(OS_ANDROID)
 bool LowerCaseEqualsASCII(const char* a_begin,
                           const char* a_end,
                           const char* b) {
@@ -533,6 +535,8 @@ bool LowerCaseEqualsASCII(const char16* a_begin,
 }
 #endif
 
+#endif  // !defined(OS_ANDROID)
+
 bool EqualsASCII(const string16& a, const base::StringPiece& b) {
   if (a.length() != b.length())
     return false;