[Android] Roll android_tools to Android M SDK.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 12521d92f162af7d6e335c290ab9cd7a5c91a0a8..66d8ae33a9504bad0c357b817e399cb03a4a16a2 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -5,9 +5,6 @@
 {
   'variables': {
     'chromium_code': 1,
-    # Defines an extra set of libs with an alternate copy of org.apache.http.
-    # TODO(yfriedman): Remove this when crbug.com/488192 is fixed.
-    'net_test_extra_libs': [],
     'linux_link_kerberos%': 0,
     'conditions': [
       ['chromeos==1 or embedded==1 or OS=="ios"', {
@@ -1422,11 +1419,11 @@
             'java_in_dir': '../net/test/android/javatests',
           },
           'dependencies': [
+            'net_java',
             'net_test_support',
             'url_request_failed_job_java',
             '../base/base.gyp:base_java',
-            'net_java',
-            '<@(net_test_extra_libs)',
+            '../third_party/android_tools/android_tools.gyp:legacy_http_javalib',
           ],
           'includes': [ '../build/java.gypi' ],
         },