[Android] Roll android_tools to Android M SDK.

build/secondary/third_party/android_tools/BUILD.gn

Index: build/secondary/third_party/android_tools/BUILD.gn
diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
index 06503b3c4afee1693c5cf9c9886cf591240a7533..a6b375893426d670c9dd4778010028c709cfcc32 100644
--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -114,6 +114,7 @@ android_java_prebuilt("google_play_services_default_java") {
     ":android_support_v13_java",
     ":android_support_v7_mediarouter_java",
     ":google_play_services_default_resources",
+    ":legacy_http_javalib",
   ]
   proguard_preprocess = true
   proguard_config = "//third_party/android_tools/proguard.flags"
@@ -142,3 +143,8 @@ action("check_sdk_extras_version") {
     "$target_gen_dir/checked_sdk_extras_version.stamp",
   ]
 }
+
+# TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
+android_java_prebuilt("legacy_http_javalib") {
+  jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
+}