diff --git a/rules/BUILD b/rules/BUILD
index 20900b800..4e67fde72 100644
--- a/rules/BUILD
+++ b/rules/BUILD
@@ -36,15 +36,14 @@ bzl_library(
         "bundletool.bzl",
         "busybox.bzl",
         "common.bzl",
-        "desugar.bzl",
         "data_binding.bzl",
+        "desugar.bzl",
         "idl.bzl",
         "instrumented_app_info_aspect.bzl",
         "intellij.bzl",
         "java.bzl",
         "migration_tag_DONOTUSE.bzl",
         "native_deps.bzl",
-        "native_toolchain_attrs.bzl",
         "path.bzl",
         "processing_pipeline.bzl",
         "proguard.bzl",
@@ -115,12 +114,12 @@ bzl_library(
         ":common_bzl",
         ":min_sdk_version_bzl",
         "//rules/aar_import:bzl",
+        "//rules/android_application:bzl",
         "//rules/android_library:bzl",
+        "//rules/android_local_test:bzl",
         "//rules/android_sandboxed_sdk:bzl",
         "//rules/android_sdk_repository:bzl",
         "//rules/flags:bzl",
-        "//rules/android_application:bzl",
-        "//rules/android_local_test:bzl",
         "@bazel_skylib//lib:collections",
         "@rules_java//java/common",
     ],
@@ -147,8 +146,8 @@ bzl_library(
 
 stardoc(
     name = "stardoc",
-    input = "doc_rules.bzl",
     out = "stardoc.md",
+    input = "doc_rules.bzl",
     deps = [":doc_rules"],
 )
 
diff --git a/rules/attrs.bzl b/rules/attrs.bzl
index 8b4d578a4..bb835437a 100644
--- a/rules/attrs.bzl
+++ b/rules/attrs.bzl
@@ -16,8 +16,7 @@
 
 load("//rules:android_split_transition.bzl", "android_transition")
 load("@rules_java//java/common:java_plugin_info.bzl", "JavaPluginInfo")
-load(":native_toolchain_attrs.bzl", "ANDROID_SDK_TOOLCHAIN_TYPE_DEFAULT")
-load(":utils.bzl", "log")
+load(":utils.bzl", "ANDROID_SDK_TOOLCHAIN_TYPE", "log")
 
 def _add(attrs, *others):
     new = {}
@@ -346,7 +345,7 @@ ANDROID_SDK_ATTRS = dict(
 _ANDROID_TOOLCHAIN_ATTRS = dict(
     _android_sdk_toolchain_type = attr.label(
         allow_rules = ["toolchain_type"],
-        default = ANDROID_SDK_TOOLCHAIN_TYPE_DEFAULT,
+        default = ANDROID_SDK_TOOLCHAIN_TYPE,
     ),
 )
 
diff --git a/rules/native_toolchain_attrs.bzl b/rules/native_toolchain_attrs.bzl
deleted file mode 100644
index c1317b8b2..000000000
--- a/rules/native_toolchain_attrs.bzl
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023 The Bazel Authors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Default label for native android sdk toolchain type."""
-ANDROID_SDK_TOOLCHAIN_TYPE_DEFAULT = Label("@bazel_tools//tools/android:sdk_toolchain_type")