Move android_sdk_for_testing bind into Android{S,N}dkRepositoryRule s…

…o that eventually we can remove it from Bazel's WORKSPACE file.

We'll need to wait for the next Bazel release to remove it from the WORKSPACE file. This should hopefully make the process of the Bazel sheriff running android_integration_test.sh a little easier.

--
PiperOrigin-RevId: 146789106
MOS_MIGRATED_REVID=146789106

src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidNdkRepositoryRule.java

@@ -49,7 +49,9 @@ public Map<String, Label> apply(Rule rule) {
 
           return ImmutableMap.of(
               "android/crosstool",
-              Label.parseAbsoluteUnchecked("@" + rule.getName() + "//:" + defaultToolchainName));
+              Label.parseAbsoluteUnchecked("@" + rule.getName() + "//:" + defaultToolchainName),
+              "android_ndk_for_testing",
+              Label.parseAbsoluteUnchecked("@" + rule.getName() + "//:files"));
         }
       };
 

src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java

@@ -47,6 +47,7 @@ public Map<String, Label> apply(Rule rule) {
           builder.put("android/sdk", Label.parseAbsoluteUnchecked(prefix + "sdk"));
           builder.put(
               "android/dx_jar_import", Label.parseAbsoluteUnchecked(prefix + "dx_jar_import"));
+          builder.put("android_sdk_for_testing", Label.parseAbsoluteUnchecked(prefix + "files"));
           return builder.build();
         }
       };

src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE

@@ -1,2 +1,4 @@
 bind(name = "android/sdk")
 bind(name = "android/crosstool", actual = "@bazel_tools//tools/cpp:toolchain")
+bind(name = "android_sdk_for_testing", actual = "//:dummy")
+bind(name = "android_ndk_for_testing", actual = "//:dummy")