Implement alternative string conversion functions in net/ on Android,

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 50520b983cd3d96a37ed84bdf16e7a869024f149..bc6ba3a5956ac51dc714f9458e3a912d69499671 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -441,6 +441,16 @@
             ],
           },
         ],
+        [ 'use_icu_alternatives_on_android == 1', {
+            'sources!': [
+              'base/net_string_util_icu.cc',
+            ],
+            'sources': [
+              'base/net_string_util_icu_alternatives_android.cc',
+              'base/net_string_util_icu_alternatives_android.h',
+            ],
+          },
+        ],
       ],
       'target_conditions': [
         # These source files are excluded by default platform rules, but they
@@ -1433,6 +1443,14 @@
             'jni_generator_ptr_type': 'long',
           },
           'includes': [ '../build/jni_generator.gypi' ],
+
+          'conditions': [
+            ['use_icu_alternatives_on_android==1', {
+              'sources': [
+                'android/java/src/org/chromium/net/NetStringUtil.java',
+              ],
+            }],
+          ],
         },
         {
           'target_name': 'net_test_jni_headers',