[Cronet] Adjust to Android M permissions model

components/cronet/android/BUILD.gn

Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index ee5bc3fc17f403c3bf2f0662a28e5cbe4f0cfe18..1d7f480d0215896b85ddf8bce90f07641673bae7 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -256,7 +256,15 @@ android_library("cronet_api") {
   ]
 
   deps = [
-    "//third_party/android_tools:android_support_annotations_javalib",
+    # Technically this target only needs to depend on
+    # android_support_annotations_javalib however it appears
+    # android_support_v13_java includes some duplicate definitions with
+    # android_support_annotations_javalib so build errors will result if this
+    # target pulls in android_support_annotations_javalib and targets dependent
+    # on this target pull in android_support_v13_java, so just pull in the
+    # superset android_support_v13_java here as it also contains the
+    # annotations.
+    "//third_party/android_tools:android_support_v13_java",
   ]
 
   srcjar_deps = [
@@ -295,7 +303,16 @@ android_library("cronet_java") {
     ":cronet_api",
     "//base:base_java",
     "//net/android:net_java",
-    "//third_party/android_tools:android_support_annotations_javalib",
+
+    # Technically this target only needs to depend on
+    # android_support_annotations_javalib however it appears
+    # android_support_v13_java includes some duplicate definitions with
+    # android_support_annotations_javalib so build errors will result if this
+    # target pulls in android_support_annotations_javalib and targets dependent
+    # on this target pull in android_support_v13_java, so just pull in the
+    # superset android_support_v13_java here as it also contains the
+    # annotations.
+    "//third_party/android_tools:android_support_v13_java",
     "//third_party/jsr-305:jsr_305_javalib",
   ]
 
@@ -323,6 +340,7 @@ android_library("cronet_sample_apk_java") {
     ":cronet_java",
     ":cronet_sample_apk_resources",
     "//base:base_java",
+    "//third_party/android_tools:android_support_v13_java",
   ]
 
   run_findbugs_override = true