[Android] Roll android_tools to Android M SDK.

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 5429060d9bc6269a609dd6fa5751a5fced7e0865..35176efcb79aedd0c2bb5cab6e181f88d3ee149b 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -159,10 +159,6 @@ android_library("chrome_java") {
     google_play_services_library,
   ]
 
-  if (android_sdk_version != "M") {
-    deps += [ "//third_party/android_tools:preview_java_sources" ]
-  }
-
   srcjar_deps = [
     ":chrome_android_java_enums_srcjar",
     ":chrome_version_srcjar",
@@ -464,6 +460,7 @@ android_library("chrome_javatests") {
     "//third_party/android_protobuf:protobuf_nano_javalib",
     "//third_party/android_tools:android_support_v13_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
+    "//third_party/android_tools:legacy_http_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
     "//third_party/jsr-305:jsr_305_javalib",
@@ -632,6 +629,7 @@ android_library("chrome_shared_test_java") {
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/android_tools:android_support_v13_java",
+    "//third_party/android_tools:legacy_http_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/jsr-305:jsr_305_javalib",
     "//ui/android:ui_java",