Merge "Reland: "Add aliases for -nodeps targets"" into main
diff --git a/current/androidx/m2repository/androidx/activity/activity-compose/1.10.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/activity/activity-compose/1.10.0-alpha01/Android.bp
index 0ef23b5..d24ebb7 100644
--- a/current/androidx/m2repository/androidx/activity/activity-compose/1.10.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/activity/activity-compose/1.10.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.activity_activity-compose-nodeps",
+    name: "androidx.activity_activity-compose",
     aars: ["activity-compose-1.10.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.activity_activity-compose",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.activity_activity-compose-nodeps",
-        "androidx.activity_activity-ktx",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.runtime_runtime-saveable",
-        "androidx.compose.ui_ui",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/activity/activity-ktx/1.10.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/activity/activity-ktx/1.10.0-alpha01/Android.bp
index 934f519..2f7ee46 100644
--- a/current/androidx/m2repository/androidx/activity/activity-ktx/1.10.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/activity/activity-ktx/1.10.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.activity_activity-ktx-nodeps",
+    name: "androidx.activity_activity-ktx",
     aars: ["activity-ktx-1.10.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.activity_activity-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.activity_activity-ktx-nodeps",
-        "androidx.activity_activity",
-        "androidx.core_core-ktx",
-        "androidx.lifecycle_lifecycle-runtime-ktx",
-        "androidx.lifecycle_lifecycle-viewmodel-ktx",
-        "androidx.savedstate_savedstate-ktx",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/activity/activity/1.10.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/activity/activity/1.10.0-alpha01/Android.bp
index 22012d6..d4e0963 100644
--- a/current/androidx/m2repository/androidx/activity/activity/1.10.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/activity/activity/1.10.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.activity_activity-nodeps",
+    name: "androidx.activity_activity",
     aars: ["activity-1.10.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -36,29 +36,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.activity_activity",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.activity_activity-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.lifecycle_lifecycle-runtime",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "androidx.lifecycle_lifecycle-viewmodel-savedstate",
-        "androidx.profileinstaller_profileinstaller",
-        "androidx.savedstate_savedstate",
-        "androidx.tracing_tracing",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/annotation/annotation-experimental/1.4.0-rc01/Android.bp b/current/androidx/m2repository/androidx/annotation/annotation-experimental/1.4.0-rc01/Android.bp
index 3aa4a5f..2e63009 100644
--- a/current/androidx/m2repository/androidx/annotation/annotation-experimental/1.4.0-rc01/Android.bp
+++ b/current/androidx/m2repository/androidx/annotation/annotation-experimental/1.4.0-rc01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.annotation_annotation-experimental-nodeps",
+    name: "androidx.annotation_annotation-experimental",
     aars: ["annotation-experimental-1.4.0-rc01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,20 +27,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.annotation_annotation-experimental",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.annotation_annotation-experimental-nodeps",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/annotation/annotation-jvm/1.8.0-beta01/Android.bp b/current/androidx/m2repository/androidx/annotation/annotation-jvm/1.8.0-beta01/Android.bp
index 456dcc6..07edd1b 100644
--- a/current/androidx/m2repository/androidx/annotation/annotation-jvm/1.8.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/annotation/annotation-jvm/1.8.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.annotation_annotation-nodeps",
+    name: "androidx.annotation_annotation",
     jars: ["annotation-jvm-1.8.0-beta01.jar"],
     sdk_version: "34",
     host_supported: true,
@@ -24,21 +24,7 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.annotation_annotation",
-    sdk_version: "34",
-    host_supported: true,
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.annotation_annotation-nodeps",
         "kotlin-stdlib",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/appcompat/appcompat-resources/1.7.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appcompat/appcompat-resources/1.7.0-alpha04/Android.bp
index 892e921..884fb06 100644
--- a/current/androidx/m2repository/androidx/appcompat/appcompat-resources/1.7.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/appcompat/appcompat-resources/1.7.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.appcompat_appcompat-resources-nodeps",
+    name: "androidx.appcompat_appcompat-resources",
     aars: ["appcompat-resources-1.7.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "androidx.vectordrawable_vectordrawable-animated",
     ],
 }
-
-android_library {
-    name: "androidx.appcompat_appcompat-resources",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.appcompat_appcompat-resources-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.vectordrawable_vectordrawable",
-        "androidx.vectordrawable_vectordrawable-animated",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/appcompat/appcompat/1.7.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appcompat/appcompat/1.7.0-alpha04/Android.bp
index 68be42e..a07f899 100644
--- a/current/androidx/m2repository/androidx/appcompat/appcompat/1.7.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/appcompat/appcompat/1.7.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.appcompat_appcompat-nodeps",
+    name: "androidx.appcompat_appcompat",
     aars: ["appcompat-1.7.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -43,36 +43,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.appcompat_appcompat",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.appcompat_appcompat-nodeps",
-        "androidx.activity_activity",
-        "androidx.annotation_annotation",
-        "androidx.appcompat_appcompat-resources",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.core_core-ktx",
-        "androidx.cursoradapter_cursoradapter",
-        "androidx.drawerlayout_drawerlayout",
-        "androidx.emoji2_emoji2",
-        "androidx.emoji2_emoji2-views-helper",
-        "androidx.fragment_fragment",
-        "androidx.lifecycle_lifecycle-runtime",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "androidx.profileinstaller_profileinstaller",
-        "androidx.resourceinspection_resourceinspection-annotation",
-        "androidx.savedstate_savedstate",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/appsearch/appsearch-builtin-types/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appsearch/appsearch-builtin-types/1.1.0-alpha04/Android.bp
index 0465bc1..359aae2 100644
--- a/current/androidx/m2repository/androidx/appsearch/appsearch-builtin-types/1.1.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/appsearch/appsearch-builtin-types/1.1.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.appsearch_appsearch-builtin-types-nodeps",
+    name: "androidx.appsearch_appsearch-builtin-types",
     aars: ["appsearch-builtin-types-1.1.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.appsearch_appsearch-builtin-types",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.appsearch_appsearch-builtin-types-nodeps",
-        "androidx.appsearch_appsearch",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/appsearch/appsearch-compiler/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appsearch/appsearch-compiler/1.1.0-alpha04/Android.bp
index b4e7477..4eb84b4 100644
--- a/current/androidx/m2repository/androidx/appsearch/appsearch-compiler/1.1.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/appsearch/appsearch-compiler/1.1.0-alpha04/Android.bp
@@ -15,15 +15,9 @@
 }
 
 java_import_host {
-    name: "androidx.appsearch_appsearch-compiler-nodeps",
-    jars: ["appsearch-compiler-1.1.0-alpha04.jar"],
-    sdk_version: "34",
-}
-
-java_library_host {
     name: "androidx.appsearch_appsearch-compiler",
+    jars: ["appsearch-compiler-1.1.0-alpha04.jar"],
     static_libs: [
-        "androidx.appsearch_appsearch-compiler-nodeps",
         "androidx.annotation_annotation",
         "auto_common",
         "auto_value_annotations",
@@ -31,6 +25,4 @@
         "javax-annotation-api-prebuilt-host-jar",
         "libauto_value_plugin",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/appsearch/appsearch-local-storage/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appsearch/appsearch-local-storage/1.1.0-alpha04/Android.bp
index 56c5a05..f41388b 100644
--- a/current/androidx/m2repository/androidx/appsearch/appsearch-local-storage/1.1.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/appsearch/appsearch-local-storage/1.1.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.appsearch_appsearch_local_storage-nodeps",
+    name: "androidx.appsearch_appsearch_local_storage",
     aars: ["appsearch-local-storage-1.1.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.appsearch_appsearch_local_storage",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.appsearch_appsearch_local_storage-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.appsearch_appsearch",
-        "androidx.collection_collection",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/appsearch/appsearch-platform-storage/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appsearch/appsearch-platform-storage/1.1.0-alpha04/Android.bp
index fa87ffb..9aee085 100644
--- a/current/androidx/m2repository/androidx/appsearch/appsearch-platform-storage/1.1.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/appsearch/appsearch-platform-storage/1.1.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.appsearch_appsearch-platform-storage-nodeps",
+    name: "androidx.appsearch_appsearch-platform-storage",
     aars: ["appsearch-platform-storage-1.1.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.appsearch_appsearch-platform-storage",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.appsearch_appsearch-platform-storage-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.appsearch_appsearch",
-        "androidx.collection_collection",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/appsearch/appsearch/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/appsearch/appsearch/1.1.0-alpha04/Android.bp
index 1b065b5..68c4f8c 100644
--- a/current/androidx/m2repository/androidx/appsearch/appsearch/1.1.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/appsearch/appsearch/1.1.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.appsearch_appsearch-nodeps",
+    name: "androidx.appsearch_appsearch",
     aars: ["appsearch-1.1.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "guava-listenablefuture-prebuilt-jar",
     ],
 }
-
-android_library {
-    name: "androidx.appsearch_appsearch",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.appsearch_appsearch-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.core_core",
-        "guava-listenablefuture-prebuilt-jar",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/arch/core/core-common/2.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/arch/core/core-common/2.2.0-alpha01/Android.bp
index 73daf3e..4ab2958 100644
--- a/current/androidx/m2repository/androidx/arch/core/core-common/2.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/arch/core/core-common/2.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.arch.core_core-common-nodeps",
+    name: "androidx.arch.core_core-common",
     jars: ["core-common-2.2.0-alpha01.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,20 +23,7 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.arch.core_core-common",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.arch.core_core-common-nodeps",
         "androidx.annotation_annotation",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/arch/core/core-runtime/2.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/arch/core/core-runtime/2.2.0-alpha01/Android.bp
index 9c5012b..78c9d29 100644
--- a/current/androidx/m2repository/androidx/arch/core/core-runtime/2.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/arch/core/core-runtime/2.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.arch.core_core-runtime-nodeps",
+    name: "androidx.arch.core_core-runtime",
     aars: ["core-runtime-2.2.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.arch.core_core-common",
     ],
 }
-
-android_library {
-    name: "androidx.arch.core_core-runtime",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.arch.core_core-runtime-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.arch.core_core-common",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/arch/core/core-testing/2.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/arch/core/core-testing/2.2.0-alpha01/Android.bp
index c26b25c..31ee949 100644
--- a/current/androidx/m2repository/androidx/arch/core/core-testing/2.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/arch/core/core-testing/2.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.arch.core_core-testing-nodeps",
+    name: "androidx.arch.core_core-testing",
     aars: ["core-testing-2.2.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "mockito-core",
     ],
 }
-
-android_library {
-    name: "androidx.arch.core_core-testing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.arch.core_core-testing-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.arch.core_core-runtime",
-        "junit",
-        "mockito-core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/asynclayoutinflater/asynclayoutinflater/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/asynclayoutinflater/asynclayoutinflater/1.1.0-alpha02/Android.bp
index cd716f7..abd5044 100644
--- a/current/androidx/m2repository/androidx/asynclayoutinflater/asynclayoutinflater/1.1.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/asynclayoutinflater/asynclayoutinflater/1.1.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.asynclayoutinflater_asynclayoutinflater-nodeps",
+    name: "androidx.asynclayoutinflater_asynclayoutinflater",
     aars: ["asynclayoutinflater-1.1.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.asynclayoutinflater_asynclayoutinflater",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.asynclayoutinflater_asynclayoutinflater-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/autofill/autofill/1.2.0-beta02/Android.bp b/current/androidx/m2repository/androidx/autofill/autofill/1.2.0-beta02/Android.bp
index 47cf1e0..2b2c5d9 100644
--- a/current/androidx/m2repository/androidx/autofill/autofill/1.2.0-beta02/Android.bp
+++ b/current/androidx/m2repository/androidx/autofill/autofill/1.2.0-beta02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.autofill_autofill-nodeps",
+    name: "androidx.autofill_autofill",
     aars: ["autofill-1.2.0-beta02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,20 +27,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.autofill_autofill",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.autofill_autofill-nodeps",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/benchmark/benchmark-common/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/benchmark/benchmark-common/1.3.0-alpha02/Android.bp
index 2213572..75b2108 100644
--- a/current/androidx/m2repository/androidx/benchmark/benchmark-common/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/benchmark/benchmark-common/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.benchmark_benchmark-common-nodeps",
+    name: "androidx.benchmark_benchmark-common",
     aars: ["benchmark-common-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "wire-runtime",
     ],
 }
-
-android_library {
-    name: "androidx.benchmark_benchmark-common",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.benchmark_benchmark-common-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.test.monitor",
-        "androidx.tracing_tracing-ktx",
-        "androidx.tracing_tracing-perfetto-handshake",
-        "kotlin-stdlib",
-        "wire-runtime",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/benchmark/benchmark-junit4/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/benchmark/benchmark-junit4/1.3.0-alpha02/Android.bp
index 2e58912..fafb0b9 100644
--- a/current/androidx/m2repository/androidx/benchmark/benchmark-junit4/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/benchmark/benchmark-junit4/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.benchmark_benchmark-junit4-nodeps",
+    name: "androidx.benchmark_benchmark-junit4",
     aars: ["benchmark-junit4-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.benchmark_benchmark-junit4",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.benchmark_benchmark-junit4-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.benchmark_benchmark-common",
-        "androidx.test.rules",
-        "androidx.test.runner",
-        "androidx.tracing_tracing-ktx",
-        "junit",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/benchmark/benchmark-macro-junit4/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/benchmark/benchmark-macro-junit4/1.3.0-alpha02/Android.bp
index a9009da..b695b35 100644
--- a/current/androidx/m2repository/androidx/benchmark/benchmark-macro-junit4/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/benchmark/benchmark-macro-junit4/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.benchmark_benchmark-macro-junit4-nodeps",
+    name: "androidx.benchmark_benchmark-macro-junit4",
     aars: ["benchmark-macro-junit4-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.benchmark_benchmark-macro-junit4",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "23",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.benchmark_benchmark-macro-junit4-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.benchmark_benchmark-common",
-        "androidx.benchmark_benchmark-macro",
-        "androidx.test.rules",
-        "androidx.test.runner",
-        "androidx.test.uiautomator_uiautomator",
-        "junit",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/benchmark/benchmark-macro/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/benchmark/benchmark-macro/1.3.0-alpha02/Android.bp
index 0be5068..f3d97f0 100644
--- a/current/androidx/m2repository/androidx/benchmark/benchmark-macro/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/benchmark/benchmark-macro/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.benchmark_benchmark-macro-nodeps",
+    name: "androidx.benchmark_benchmark-macro",
     aars: ["benchmark-macro-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -39,32 +39,3 @@
         "wire-runtime",
     ],
 }
-
-android_library {
-    name: "androidx.benchmark_benchmark-macro",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "23",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.benchmark_benchmark-macro-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.benchmark_benchmark-common",
-        "androidx.core_core",
-        "androidx.profileinstaller_profileinstaller",
-        "androidx.test.core",
-        "androidx.test.uiautomator_uiautomator",
-        "androidx.tracing_tracing-ktx",
-        "androidx.tracing_tracing-perfetto",
-        "androidx.tracing_tracing-perfetto-binary",
-        "androidx.tracing_tracing-perfetto-handshake",
-        "junit",
-        "kotlin-stdlib",
-        "wire-runtime",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/biometric/biometric/1.2.0-alpha06/Android.bp b/current/androidx/m2repository/androidx/biometric/biometric/1.2.0-alpha06/Android.bp
index 7392438..8552f97 100644
--- a/current/androidx/m2repository/androidx/biometric/biometric/1.2.0-alpha06/Android.bp
+++ b/current/androidx/m2repository/androidx/biometric/biometric/1.2.0-alpha06/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.biometric_biometric-nodeps",
+    name: "androidx.biometric_biometric",
     aars: ["biometric-1.2.0-alpha06.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "androidx.lifecycle_lifecycle-viewmodel",
     ],
 }
-
-android_library {
-    name: "androidx.biometric_biometric",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.biometric_biometric-nodeps",
-        "androidx.activity_activity",
-        "androidx.annotation_annotation",
-        "androidx.appcompat_appcompat",
-        "androidx.core_core",
-        "androidx.fragment_fragment",
-        "androidx.lifecycle_lifecycle-common-java8",
-        "androidx.lifecycle_lifecycle-livedata-core",
-        "androidx.lifecycle_lifecycle-viewmodel",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/browser/browser/1.9.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/browser/browser/1.9.0-alpha01/Android.bp
index d8bcf0c..d330417 100644
--- a/current/androidx/m2repository/androidx/browser/browser/1.9.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/browser/browser/1.9.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.browser_browser-nodeps",
+    name: "androidx.browser_browser",
     aars: ["browser-1.9.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "guava-listenablefuture-prebuilt-jar",
     ],
 }
-
-android_library {
-    name: "androidx.browser_browser",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.browser_browser-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.core_core",
-        "androidx.interpolator_interpolator",
-        "guava-listenablefuture-prebuilt-jar",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/camera/camera-camera2-pipe-integration/1.0.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/camera/camera-camera2-pipe-integration/1.0.0-alpha01/Android.bp
index 526d6d7..480abc2 100644
--- a/current/androidx/m2repository/androidx/camera/camera-camera2-pipe-integration/1.0.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/camera/camera-camera2-pipe-integration/1.0.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.camera_camera-camera2-pipe-integration-nodeps",
+    name: "androidx.camera_camera-camera2-pipe-integration",
     aars: ["camera-camera2-pipe-integration-1.0.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -36,29 +36,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.camera_camera-camera2-pipe-integration",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.camera_camera-camera2-pipe-integration-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.camera_camera-camera2-pipe",
-        "androidx.camera_camera-core",
-        "androidx.concurrent_concurrent-futures-ktx",
-        "androidx.core_core",
-        "androidx.lifecycle_lifecycle-livedata-ktx",
-        "dagger2",
-        "kotlin-stdlib",
-        "kotlinx_atomicfu",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/camera/camera-camera2-pipe/1.0.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/camera/camera-camera2-pipe/1.0.0-alpha01/Android.bp
index 76795a9..1a9099b 100644
--- a/current/androidx/m2repository/androidx/camera/camera-camera2-pipe/1.0.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/camera/camera-camera2-pipe/1.0.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.camera_camera-camera2-pipe-nodeps",
+    name: "androidx.camera_camera-camera2-pipe",
     aars: ["camera-camera2-pipe-1.0.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.camera_camera-camera2-pipe",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.camera_camera-camera2-pipe-nodeps",
-        "androidx.annotation_annotation",
-        "dagger2",
-        "kotlin-stdlib",
-        "kotlinx_atomicfu",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp
index b947ae4..82945c2 100644
--- a/current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/camera/camera-camera2/1.4.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.camera_camera-camera2-nodeps",
+    name: "androidx.camera_camera-camera2",
     aars: ["camera-camera2-1.4.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "guava-listenablefuture-prebuilt-jar",
     ],
 }
-
-android_library {
-    name: "androidx.camera_camera-camera2",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.camera_camera-camera2-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.camera_camera-core",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.core_core",
-        "auto_value_annotations",
-        "guava-listenablefuture-prebuilt-jar",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/camera/camera-core/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-core/1.4.0-alpha05/Android.bp
index 0db0693..af8b6bc 100644
--- a/current/androidx/m2repository/androidx/camera/camera-core/1.4.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/camera/camera-core/1.4.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.camera_camera-core-nodeps",
+    name: "androidx.camera_camera-core",
     aars: ["camera-core-1.4.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -38,31 +38,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.camera_camera-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.camera_camera-core-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.concurrent_concurrent-futures-ktx",
-        "androidx.core_core",
-        "androidx.exifinterface_exifinterface",
-        "androidx.lifecycle_lifecycle-common",
-        "androidx.lifecycle_lifecycle-livedata",
-        "auto_value_annotations",
-        "guava-listenablefuture-prebuilt-jar",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/camera/camera-extensions/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-extensions/1.4.0-alpha05/Android.bp
index 11d0db4..a7a4338 100644
--- a/current/androidx/m2repository/androidx/camera/camera-extensions/1.4.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/camera/camera-extensions/1.4.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.camera_camera-extensions-nodeps",
+    name: "androidx.camera_camera-extensions",
     aars: ["camera-extensions-1.4.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "guava-listenablefuture-prebuilt-jar",
     ],
 }
-
-android_library {
-    name: "androidx.camera_camera-extensions",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.camera_camera-extensions-nodeps",
-        "androidx.camera_camera-core",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.core_core",
-        "auto_value_annotations",
-        "guava-listenablefuture-prebuilt-jar",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/camera/camera-lifecycle/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-lifecycle/1.4.0-alpha05/Android.bp
index 9315639..34b82dd 100644
--- a/current/androidx/m2repository/androidx/camera/camera-lifecycle/1.4.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/camera/camera-lifecycle/1.4.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.camera_camera-lifecycle-nodeps",
+    name: "androidx.camera_camera-lifecycle",
     aars: ["camera-lifecycle-1.4.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.camera_camera-lifecycle",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.camera_camera-lifecycle-nodeps",
-        "androidx.camera_camera-core",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.concurrent_concurrent-futures-ktx",
-        "androidx.core_core",
-        "androidx.lifecycle_lifecycle-common",
-        "auto_value_annotations",
-        "guava-listenablefuture-prebuilt-jar",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/camera/camera-video/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-video/1.4.0-alpha05/Android.bp
index 8eb3a7e..51e69fc 100644
--- a/current/androidx/m2repository/androidx/camera/camera-video/1.4.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/camera/camera-video/1.4.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.camera_camera-video-nodeps",
+    name: "androidx.camera_camera-video",
     aars: ["camera-video-1.4.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "auto_value_annotations",
     ],
 }
-
-android_library {
-    name: "androidx.camera_camera-video",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.camera_camera-video-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.camera_camera-core",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.core_core",
-        "auto_value_annotations",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/Android.bp
index cf45bf9..3c3ac45 100644
--- a/current/androidx/m2repository/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/camera/camera-viewfinder-core/1.4.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.camera_camera-viewfinder-core-nodeps",
+    name: "androidx.camera_camera-viewfinder-core",
     aars: ["camera-viewfinder-core-1.4.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -37,30 +37,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.camera_camera-viewfinder-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.camera_camera-viewfinder-core-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.appcompat_appcompat",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.concurrent_concurrent-futures-ktx",
-        "androidx.core_core",
-        "androidx.test.espresso.idling-resource",
-        "auto_value_annotations",
-        "guava-listenablefuture-prebuilt-jar",
-        "kotlinx_coroutines",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/camera/camera-viewfinder/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/camera/camera-viewfinder/1.4.0-alpha05/Android.bp
index 19a3413..08f8c8a 100644
--- a/current/androidx/m2repository/androidx/camera/camera-viewfinder/1.4.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/camera/camera-viewfinder/1.4.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.camera_camera-viewfinder-nodeps",
+    name: "androidx.camera_camera-viewfinder",
     aars: ["camera-viewfinder-1.4.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -38,31 +38,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.camera_camera-viewfinder",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.camera_camera-viewfinder-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.appcompat_appcompat",
-        "androidx.camera_camera-viewfinder-core",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.concurrent_concurrent-futures-ktx",
-        "androidx.core_core",
-        "androidx.test.espresso.idling-resource",
-        "auto_value_annotations",
-        "guava-listenablefuture-prebuilt-jar",
-        "kotlinx_coroutines",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/car/app/app-automotive/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/car/app/app-automotive/1.4.0-alpha01/Android.bp
index 4f970b3..d116bc9 100644
--- a/current/androidx/m2repository/androidx/car/app/app-automotive/1.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/car/app/app-automotive/1.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.car.app_app-automotive-nodeps",
+    name: "androidx.car.app_app-automotive",
     aars: ["app-automotive-1.4.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -37,30 +37,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.car.app_app-automotive",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "29",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.car.app_app-automotive-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.car.app_app",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.core_core",
-        "androidx.fragment_fragment",
-        "androidx.lifecycle_lifecycle-common-java8",
-        "auto_value_annotations",
-        "guava",
-        "guava-listenablefuture-prebuilt-jar",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/car/app/app-testing/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/car/app/app-testing/1.4.0-alpha01/Android.bp
index edf004f..75f0b9e 100644
--- a/current/androidx/m2repository/androidx/car/app/app-testing/1.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/car/app/app-testing/1.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.car.app_app-testing-nodeps",
+    name: "androidx.car.app_app-testing",
     aars: ["app-testing-1.4.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "androidx.lifecycle_lifecycle-runtime",
     ],
 }
-
-android_library {
-    name: "androidx.car.app_app-testing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.car.app_app-testing-nodeps",
-        "Robolectric_all-target_upstream",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.car.app_app",
-        "androidx.lifecycle_lifecycle-common-java8",
-        "androidx.lifecycle_lifecycle-runtime",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/car/app/app/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/car/app/app/1.4.0-alpha01/Android.bp
index c8ee044..09b2b91 100644
--- a/current/androidx/m2repository/androidx/car/app/app/1.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/car/app/app/1.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.car.app_app-nodeps",
+    name: "androidx.car.app_app",
     aars: ["app-1.4.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.car.app_app",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.car.app_app-nodeps",
-        "androidx.activity_activity",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.core_core",
-        "androidx.lifecycle_lifecycle-common-java8",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "guava",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/cardview/cardview/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/cardview/cardview/1.1.0-alpha01/Android.bp
index b9ea87e..5937cad 100644
--- a/current/androidx/m2repository/androidx/cardview/cardview/1.1.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/cardview/cardview/1.1.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.cardview_cardview-nodeps",
+    name: "androidx.cardview_cardview",
     aars: ["cardview-1.1.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.cardview_cardview",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.cardview_cardview-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/collection/collection-jvm/1.4.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/collection/collection-jvm/1.4.0-alpha02/Android.bp
index ba515e2..8ba93c9 100644
--- a/current/androidx/m2repository/androidx/collection/collection-jvm/1.4.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/collection/collection-jvm/1.4.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.collection_collection-nodeps",
+    name: "androidx.collection_collection",
     jars: ["collection-jvm-1.4.0-alpha02.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,21 +23,8 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.collection_collection",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.collection_collection-nodeps",
         "androidx.annotation_annotation",
         "kotlin-stdlib",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/collection/collection-ktx/1.4.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/collection/collection-ktx/1.4.0-alpha02/Android.bp
index bd6a395..ee1fdf8 100644
--- a/current/androidx/m2repository/androidx/collection/collection-ktx/1.4.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/collection/collection-ktx/1.4.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.collection_collection-ktx-nodeps",
+    name: "androidx.collection_collection-ktx",
     jars: ["collection-ktx-1.4.0-alpha02.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,20 +23,7 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.collection_collection-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.collection_collection-ktx-nodeps",
         "androidx.collection_collection",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/compose/animation/animation-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/animation/animation-android/1.7.0-alpha05/Android.bp
index bb40ff7..a73f095 100644
--- a/current/androidx/m2repository/androidx/compose/animation/animation-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/animation/animation-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.animation_animation-nodeps",
+    name: "androidx.compose.animation_animation",
     aars: ["animation-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -36,29 +36,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.animation_animation",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.animation_animation-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.compose.animation_animation-core",
-        "androidx.compose.foundation_foundation-layout",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-geometry",
-        "androidx.compose.ui_ui-util",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/animation/animation-core-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/animation/animation-core-android/1.7.0-alpha05/Android.bp
index bc91c5e..2c88f84 100644
--- a/current/androidx/m2repository/androidx/compose/animation/animation-core-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/animation/animation-core-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.animation_animation-core-nodeps",
+    name: "androidx.compose.animation_animation-core",
     aars: ["animation-core-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -35,28 +35,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.compose.animation_animation-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.animation_animation-core-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-graphics",
-        "androidx.compose.ui_ui-unit",
-        "androidx.compose.ui_ui-util",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/animation/animation-graphics-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/animation/animation-graphics-android/1.7.0-alpha05/Android.bp
index 25df80c..2d5c070 100644
--- a/current/androidx/m2repository/androidx/compose/animation/animation-graphics-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/animation/animation-graphics-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.animation_animation-graphics-nodeps",
+    name: "androidx.compose.animation_animation-graphics",
     aars: ["animation-graphics-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -37,30 +37,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.animation_animation-graphics",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.animation_animation-graphics-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.compose.animation_animation",
-        "androidx.compose.foundation_foundation-layout",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-geometry",
-        "androidx.compose.ui_ui-util",
-        "androidx.core_core-ktx",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/compiler/compiler-hosted/1.5.11/Android.bp b/current/androidx/m2repository/androidx/compose/compiler/compiler-hosted/1.5.11/Android.bp
index a2369ab..52fc203 100644
--- a/current/androidx/m2repository/androidx/compose/compiler/compiler-hosted/1.5.11/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/compiler/compiler-hosted/1.5.11/Android.bp
@@ -15,16 +15,8 @@
 }
 
 java_import_host {
-    name: "androidx.compose.compiler_compiler-hosted-nodeps",
-    jars: ["compiler-hosted-1.5.11.jar"],
-    sdk_version: "34",
-}
-
-java_library_host {
     name: "androidx.compose.compiler_compiler-hosted",
+    jars: ["compiler-hosted-1.5.11.jar"],
     static_libs: [
-        "androidx.compose.compiler_compiler-hosted-nodeps",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/compose/compiler/compiler/1.5.11/Android.bp b/current/androidx/m2repository/androidx/compose/compiler/compiler/1.5.11/Android.bp
index ac65807..7ba77ac 100644
--- a/current/androidx/m2repository/androidx/compose/compiler/compiler/1.5.11/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/compiler/compiler/1.5.11/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.compose.compiler_compiler-nodeps",
+    name: "androidx.compose.compiler_compiler",
     jars: ["compiler-1.5.11.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,19 +23,6 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.compose.compiler_compiler",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.compose.compiler_compiler-nodeps",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/compose/foundation/foundation-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/foundation/foundation-android/1.7.0-alpha05/Android.bp
index 75151f6..505f581 100644
--- a/current/androidx/m2repository/androidx/compose/foundation/foundation-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/foundation/foundation-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.foundation_foundation-nodeps",
+    name: "androidx.compose.foundation_foundation",
     aars: ["foundation-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -38,31 +38,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.foundation_foundation",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.foundation_foundation-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.compose.animation_animation",
-        "androidx.compose.foundation_foundation-layout",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-text",
-        "androidx.compose.ui_ui-util",
-        "androidx.core_core",
-        "androidx.emoji2_emoji2",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/foundation/foundation-layout-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/foundation/foundation-layout-android/1.7.0-alpha05/Android.bp
index 6e91de3..f3793e9 100644
--- a/current/androidx/m2repository/androidx/compose/foundation/foundation-layout-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/foundation/foundation-layout-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.foundation_foundation-layout-nodeps",
+    name: "androidx.compose.foundation_foundation-layout",
     aars: ["foundation-layout-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -36,29 +36,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.foundation_foundation-layout",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.foundation_foundation-layout-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.compose.animation_animation-core",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-unit",
-        "androidx.compose.ui_ui-util",
-        "androidx.core_core",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/material/material-android/1.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/compose/material/material-android/1.7.0-alpha01/Android.bp
index 4e97f98..3de9c02 100644
--- a/current/androidx/m2repository/androidx/compose/material/material-android/1.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/material/material-android/1.7.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.material_material-nodeps",
+    name: "androidx.compose.material_material",
     aars: ["material-android-1.7.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -41,34 +41,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.material_material",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.material_material-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.compose.animation_animation",
-        "androidx.compose.animation_animation-core",
-        "androidx.compose.foundation_foundation",
-        "androidx.compose.foundation_foundation-layout",
-        "androidx.compose.material_material-icons-core",
-        "androidx.compose.material_material-ripple",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-text",
-        "androidx.compose.ui_ui-util",
-        "androidx.lifecycle_lifecycle-runtime",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "androidx.savedstate_savedstate",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/material/material-icons-core-android/1.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/compose/material/material-icons-core-android/1.7.0-alpha01/Android.bp
index 06263fd..1b661d3 100644
--- a/current/androidx/m2repository/androidx/compose/material/material-icons-core-android/1.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/material/material-icons-core-android/1.7.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.material_material-icons-core-nodeps",
+    name: "androidx.compose.material_material-icons-core",
     aars: ["material-icons-core-android-1.7.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.material_material-icons-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.material_material-icons-core-nodeps",
-        "androidx.compose.ui_ui",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/material/material-icons-extended-android/1.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/compose/material/material-icons-extended-android/1.7.0-alpha01/Android.bp
index e36b173..e64ad34 100644
--- a/current/androidx/m2repository/androidx/compose/material/material-icons-extended-android/1.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/material/material-icons-extended-android/1.7.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.material_material-icons-extended-nodeps",
+    name: "androidx.compose.material_material-icons-extended",
     aars: ["material-icons-extended-android-1.7.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.material_material-icons-extended",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.material_material-icons-extended-nodeps",
-        "androidx.compose.material_material-icons-core",
-        "androidx.compose.runtime_runtime",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/material/material-ripple-android/1.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/compose/material/material-ripple-android/1.7.0-alpha01/Android.bp
index cd202fc..0ff599f 100644
--- a/current/androidx/m2repository/androidx/compose/material/material-ripple-android/1.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/material/material-ripple-android/1.7.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.material_material-ripple-nodeps",
+    name: "androidx.compose.material_material-ripple",
     aars: ["material-ripple-android-1.7.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.material_material-ripple",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.material_material-ripple-nodeps",
-        "androidx.collection_collection",
-        "androidx.compose.animation_animation",
-        "androidx.compose.foundation_foundation",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui-util",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/material3/material3-android/1.3.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/compose/material3/material3-android/1.3.0-alpha03/Android.bp
index cbf7c40..d6b8969 100644
--- a/current/androidx/m2repository/androidx/compose/material3/material3-android/1.3.0-alpha03/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/material3/material3-android/1.3.0-alpha03/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.material3_material3-nodeps",
+    name: "androidx.compose.material3_material3",
     aars: ["material3-android-1.3.0-alpha03.aar"],
     sdk_version: "34",
     apex_available: [
@@ -41,34 +41,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.material3_material3",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.material3_material3-nodeps",
-        "androidx.activity_activity-compose",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.compose.animation_animation-core",
-        "androidx.compose.foundation_foundation",
-        "androidx.compose.foundation_foundation-layout",
-        "androidx.compose.material_material-icons-core",
-        "androidx.compose.material_material-ripple",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-text",
-        "androidx.compose.ui_ui-util",
-        "androidx.lifecycle_lifecycle-common-java8",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/material3/material3-window-size-class-android/1.3.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/compose/material3/material3-window-size-class-android/1.3.0-alpha03/Android.bp
index 2d52a63..43a5a8b 100644
--- a/current/androidx/m2repository/androidx/compose/material3/material3-window-size-class-android/1.3.0-alpha03/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/material3/material3-window-size-class-android/1.3.0-alpha03/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.material3_material3-window-size-class-nodeps",
+    name: "androidx.compose.material3_material3-window-size-class",
     aars: ["material3-window-size-class-android-1.3.0-alpha03.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.material3_material3-window-size-class",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.material3_material3-window-size-class-nodeps",
-        "androidx.annotation_annotation-experimental",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-unit",
-        "androidx.compose.ui_ui-util",
-        "androidx.window_window",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/runtime/runtime-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/runtime/runtime-android/1.7.0-alpha05/Android.bp
index 561435b..70e5029 100644
--- a/current/androidx/m2repository/androidx/compose/runtime/runtime-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/runtime/runtime-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.runtime_runtime-nodeps",
+    name: "androidx.compose.runtime_runtime",
     aars: ["runtime-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.compose.runtime_runtime",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.runtime_runtime-nodeps",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/runtime/runtime-livedata/1.4.0-beta01/Android.bp b/current/androidx/m2repository/androidx/compose/runtime/runtime-livedata/1.4.0-beta01/Android.bp
index 09858fa..4f8fe19 100644
--- a/current/androidx/m2repository/androidx/compose/runtime/runtime-livedata/1.4.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/runtime/runtime-livedata/1.4.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.runtime_runtime-livedata-nodeps",
+    name: "androidx.compose.runtime_runtime-livedata",
     aars: ["runtime-livedata-1.4.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.runtime_runtime-livedata",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.runtime_runtime-livedata-nodeps",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.lifecycle_lifecycle-livedata",
-        "androidx.lifecycle_lifecycle-runtime",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/runtime/runtime-saveable-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/runtime/runtime-saveable-android/1.7.0-alpha05/Android.bp
index 6c8f174..c34a93e 100644
--- a/current/androidx/m2repository/androidx/compose/runtime/runtime-saveable-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/runtime/runtime-saveable-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.runtime_runtime-saveable-nodeps",
+    name: "androidx.compose.runtime_runtime-saveable",
     aars: ["runtime-saveable-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.runtime_runtime-saveable",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.runtime_runtime-saveable-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.compose.runtime_runtime",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/runtime/runtime-tracing/1.0.0-beta01/Android.bp b/current/androidx/m2repository/androidx/compose/runtime/runtime-tracing/1.0.0-beta01/Android.bp
index 710ad3f..12048d8 100644
--- a/current/androidx/m2repository/androidx/compose/runtime/runtime-tracing/1.0.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/runtime/runtime-tracing/1.0.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.runtime_runtime-tracing-nodeps",
+    name: "androidx.compose.runtime_runtime-tracing",
     aars: ["runtime-tracing-1.0.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.runtime_runtime-tracing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.runtime_runtime-tracing-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.compose.runtime_runtime",
-        "androidx.startup_startup-runtime",
-        "androidx.tracing_tracing-perfetto",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-android/1.7.0-alpha05/Android.bp
index c6c5f4e..ff2e3bd 100644
--- a/current/androidx/m2repository/androidx/compose/ui/ui-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/ui/ui-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.ui_ui-nodeps",
+    name: "androidx.compose.ui_ui",
     aars: ["ui-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -48,41 +48,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.compose.ui_ui",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.ui_ui-nodeps",
-        "androidx.activity_activity-ktx",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.autofill_autofill",
-        "androidx.collection_collection",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.runtime_runtime-saveable",
-        "androidx.compose.ui_ui-geometry",
-        "androidx.compose.ui_ui-graphics",
-        "androidx.compose.ui_ui-text",
-        "androidx.compose.ui_ui-unit",
-        "androidx.compose.ui_ui-util",
-        "androidx.core_core",
-        "androidx.customview_customview-poolingcontainer",
-        "androidx.emoji2_emoji2",
-        "androidx.lifecycle_lifecycle-runtime-compose",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "androidx.profileinstaller_profileinstaller",
-        "androidx.savedstate_savedstate-ktx",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-geometry-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-geometry-android/1.7.0-alpha05/Android.bp
index 51b754d..2ad3f63 100644
--- a/current/androidx/m2repository/androidx/compose/ui/ui-geometry-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/ui/ui-geometry-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.ui_ui-geometry-nodeps",
+    name: "androidx.compose.ui_ui-geometry",
     aars: ["ui-geometry-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.ui_ui-geometry",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.ui_ui-geometry-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui-util",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-graphics-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-graphics-android/1.7.0-alpha05/Android.bp
index 147ea09..97bb4d8 100644
--- a/current/androidx/m2repository/androidx/compose/ui/ui-graphics-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/ui/ui-graphics-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.ui_ui-graphics-nodeps",
+    name: "androidx.compose.ui_ui-graphics",
     aars: ["ui-graphics-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.ui_ui-graphics",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.ui_ui-graphics-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui-unit",
-        "androidx.compose.ui_ui-util",
-        "androidx.graphics_graphics-path",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-test-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-test-android/1.7.0-alpha05/Android.bp
index 2a6b740..60b29ec 100644
--- a/current/androidx/m2repository/androidx/compose/ui/ui-test-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/ui/ui-test-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.ui_ui-test-nodeps",
+    name: "androidx.compose.ui_ui-test",
     aars: ["ui-test-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -41,34 +41,3 @@
         "kotlinx_coroutines_test",
     ],
 }
-
-android_library {
-    name: "androidx.compose.ui_ui-test",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.ui_ui-test-nodeps",
-        "androidx.activity_activity-compose",
-        "androidx.annotation_annotation",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-graphics",
-        "androidx.compose.ui_ui-text",
-        "androidx.compose.ui_ui-unit",
-        "androidx.compose.ui_ui-util",
-        "androidx.core_core-ktx",
-        "androidx.test.espresso.core",
-        "androidx.test.espresso.idling-resource",
-        "androidx.test.monitor",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-        "kotlinx_coroutines_test",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-test-junit4-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-test-junit4-android/1.7.0-alpha05/Android.bp
index 01b07bc..fc5077b 100644
--- a/current/androidx/m2repository/androidx/compose/ui/ui-test-junit4-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/ui/ui-test-junit4-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.ui_ui-test-junit4-nodeps",
+    name: "androidx.compose.ui_ui-test-junit4",
     aars: ["ui-test-junit4-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -40,33 +40,3 @@
         "kotlinx_coroutines_test",
     ],
 }
-
-android_library {
-    name: "androidx.compose.ui_ui-test-junit4",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.ui_ui-test-junit4-nodeps",
-        "androidx.activity_activity",
-        "androidx.activity_activity-compose",
-        "androidx.annotation_annotation",
-        "androidx.compose.runtime_runtime-saveable",
-        "androidx.compose.ui_ui-test",
-        "androidx.lifecycle_lifecycle-common",
-        "androidx.lifecycle_lifecycle-runtime",
-        "androidx.test.core",
-        "androidx.test.ext.junit",
-        "androidx.test.monitor",
-        "junit",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-        "kotlinx_coroutines_test",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-test-manifest/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-test-manifest/1.7.0-alpha05/Android.bp
index 6378a95..b05324a 100644
--- a/current/androidx/m2repository/androidx/compose/ui/ui-test-manifest/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/ui/ui-test-manifest/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.ui_ui-test-manifest-nodeps",
+    name: "androidx.compose.ui_ui-test-manifest",
     aars: ["ui-test-manifest-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,20 +27,3 @@
         "androidx.activity_activity",
     ],
 }
-
-android_library {
-    name: "androidx.compose.ui_ui-test-manifest",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.ui_ui-test-manifest-nodeps",
-        "androidx.activity_activity",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-text-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-text-android/1.7.0-alpha05/Android.bp
index 95a0060..78eeb25 100644
--- a/current/androidx/m2repository/androidx/compose/ui/ui-text-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/ui/ui-text-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.ui_ui-text-nodeps",
+    name: "androidx.compose.ui_ui-text",
     aars: ["ui-text-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -38,31 +38,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.compose.ui_ui-text",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.ui_ui-text-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.runtime_runtime-saveable",
-        "androidx.compose.ui_ui-graphics",
-        "androidx.compose.ui_ui-unit",
-        "androidx.compose.ui_ui-util",
-        "androidx.core_core",
-        "androidx.emoji2_emoji2",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-tooling-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-tooling-android/1.7.0-alpha05/Android.bp
index dcdbb5b..f8d4acd 100644
--- a/current/androidx/m2repository/androidx/compose/ui/ui-tooling-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/ui/ui-tooling-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.ui_ui-tooling-nodeps",
+    name: "androidx.compose.ui_ui-tooling",
     aars: ["ui-tooling-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -37,30 +37,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.ui_ui-tooling",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.ui_ui-tooling-nodeps",
-        "androidx.activity_activity-compose",
-        "androidx.annotation_annotation",
-        "androidx.compose.animation_animation",
-        "androidx.compose.material_material",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-tooling-data",
-        "androidx.compose.ui_ui-tooling-preview",
-        "androidx.lifecycle_lifecycle-common",
-        "androidx.savedstate_savedstate-ktx",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-tooling-data-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-tooling-data-android/1.7.0-alpha05/Android.bp
index f2e6449..b1134c4 100644
--- a/current/androidx/m2repository/androidx/compose/ui/ui-tooling-data-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/ui/ui-tooling-data-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.ui_ui-tooling-data-nodeps",
+    name: "androidx.compose.ui_ui-tooling-data",
     aars: ["ui-tooling-data-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.ui_ui-tooling-data",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.ui_ui-tooling-data-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-tooling-preview-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-tooling-preview-android/1.7.0-alpha05/Android.bp
index 9c78b57..5d49531 100644
--- a/current/androidx/m2repository/androidx/compose/ui/ui-tooling-preview-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/ui/ui-tooling-preview-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.ui_ui-tooling-preview-nodeps",
+    name: "androidx.compose.ui_ui-tooling-preview",
     aars: ["ui-tooling-preview-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.ui_ui-tooling-preview",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.ui_ui-tooling-preview-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.compose.runtime_runtime",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-unit-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-unit-android/1.7.0-alpha05/Android.bp
index 2f7ab7c..c37acc4 100644
--- a/current/androidx/m2repository/androidx/compose/ui/ui-unit-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/ui/ui-unit-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.ui_ui-unit-nodeps",
+    name: "androidx.compose.ui_ui-unit",
     aars: ["ui-unit-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.ui_ui-unit",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.ui_ui-unit-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.collection_collection-ktx",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui-geometry",
-        "androidx.compose.ui_ui-util",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/compose/ui/ui-util-android/1.7.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/compose/ui/ui-util-android/1.7.0-alpha05/Android.bp
index 98d650d..095e277 100644
--- a/current/androidx/m2repository/androidx/compose/ui/ui-util-android/1.7.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/compose/ui/ui-util-android/1.7.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.compose.ui_ui-util-nodeps",
+    name: "androidx.compose.ui_ui-util",
     aars: ["ui-util-android-1.7.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.compose.ui_ui-util",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.compose.ui_ui-util-nodeps",
-        "androidx.annotation_annotation-experimental",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/concurrent/concurrent-futures-ktx/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/concurrent/concurrent-futures-ktx/1.2.0-alpha01/Android.bp
index c4da71d..cc20559 100644
--- a/current/androidx/m2repository/androidx/concurrent/concurrent-futures-ktx/1.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/concurrent/concurrent-futures-ktx/1.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.concurrent_concurrent-futures-ktx-nodeps",
+    name: "androidx.concurrent_concurrent-futures-ktx",
     jars: ["concurrent-futures-ktx-1.2.0-alpha01.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,22 +23,9 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.concurrent_concurrent-futures-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.concurrent_concurrent-futures-ktx-nodeps",
         "androidx.concurrent_concurrent-futures",
         "kotlin-stdlib",
         "kotlinx_coroutines",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/concurrent/concurrent-futures/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/concurrent/concurrent-futures/1.2.0-alpha01/Android.bp
index 37075fc..196936a 100644
--- a/current/androidx/m2repository/androidx/concurrent/concurrent-futures/1.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/concurrent/concurrent-futures/1.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.concurrent_concurrent-futures-nodeps",
+    name: "androidx.concurrent_concurrent-futures",
     jars: ["concurrent-futures-1.2.0-alpha01.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,21 +23,8 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.concurrent_concurrent-futures",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.concurrent_concurrent-futures-nodeps",
         "androidx.annotation_annotation",
         "guava-listenablefuture-prebuilt-jar",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-compose-android/1.1.0-alpha13/Android.bp b/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-compose-android/1.1.0-alpha13/Android.bp
index 5384218..d0596fa 100644
--- a/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-compose-android/1.1.0-alpha13/Android.bp
+++ b/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-compose-android/1.1.0-alpha13/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.constraintlayout_constraintlayout-compose-nodeps",
+    name: "androidx.constraintlayout_constraintlayout-compose",
     aars: ["constraintlayout-compose-android-1.1.0-alpha13.aar"],
     sdk_version: "34",
     apex_available: [
@@ -35,28 +35,3 @@
         "androidx.core_core-ktx",
     ],
 }
-
-android_library {
-    name: "androidx.constraintlayout_constraintlayout-compose",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.constraintlayout_constraintlayout-compose-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.compose.foundation_foundation",
-        "androidx.compose.foundation_foundation-layout",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-unit",
-        "androidx.compose.ui_ui-util",
-        "androidx.constraintlayout_constraintlayout-core",
-        "androidx.core_core-ktx",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-core/1.1.0-alpha13/Android.bp b/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-core/1.1.0-alpha13/Android.bp
index cfbcb40..1fb483b 100644
--- a/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-core/1.1.0-alpha13/Android.bp
+++ b/current/androidx/m2repository/androidx/constraintlayout/constraintlayout-core/1.1.0-alpha13/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.constraintlayout_constraintlayout-core-nodeps",
+    name: "androidx.constraintlayout_constraintlayout-core",
     jars: ["constraintlayout-core-1.1.0-alpha13.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,20 +23,7 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.constraintlayout_constraintlayout-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.constraintlayout_constraintlayout-core-nodeps",
         "androidx.annotation_annotation",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/constraintlayout/constraintlayout/2.2.0-alpha13/Android.bp b/current/androidx/m2repository/androidx/constraintlayout/constraintlayout/2.2.0-alpha13/Android.bp
index 25a0ce7..0975e16 100644
--- a/current/androidx/m2repository/androidx/constraintlayout/constraintlayout/2.2.0-alpha13/Android.bp
+++ b/current/androidx/m2repository/androidx/constraintlayout/constraintlayout/2.2.0-alpha13/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx-constraintlayout_constraintlayout-nodeps",
+    name: "androidx-constraintlayout_constraintlayout",
     aars: ["constraintlayout-2.2.0-alpha13.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "androidx.profileinstaller_profileinstaller",
     ],
 }
-
-android_library {
-    name: "androidx-constraintlayout_constraintlayout",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx-constraintlayout_constraintlayout-nodeps",
-        "androidx.appcompat_appcompat",
-        "androidx.constraintlayout_constraintlayout-core",
-        "androidx.core_core",
-        "androidx.profileinstaller_profileinstaller",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/coordinatorlayout/coordinatorlayout/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/coordinatorlayout/coordinatorlayout/1.3.0-alpha01/Android.bp
index ada5958..7c1d274 100644
--- a/current/androidx/m2repository/androidx/coordinatorlayout/coordinatorlayout/1.3.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/coordinatorlayout/coordinatorlayout/1.3.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.coordinatorlayout_coordinatorlayout-nodeps",
+    name: "androidx.coordinatorlayout_coordinatorlayout",
     aars: ["coordinatorlayout-1.3.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "androidx.customview_customview",
     ],
 }
-
-android_library {
-    name: "androidx.coordinatorlayout_coordinatorlayout",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.coordinatorlayout_coordinatorlayout-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.customview_customview",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/core/core-animation-testing/1.0.0-rc01/Android.bp b/current/androidx/m2repository/androidx/core/core-animation-testing/1.0.0-rc01/Android.bp
index f3e4e92..22cac46 100644
--- a/current/androidx/m2repository/androidx/core/core-animation-testing/1.0.0-rc01/Android.bp
+++ b/current/androidx/m2repository/androidx/core/core-animation-testing/1.0.0-rc01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.core_core-animation-testing-nodeps",
+    name: "androidx.core_core-animation-testing",
     aars: ["core-animation-testing-1.0.0-rc01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "junit",
     ],
 }
-
-android_library {
-    name: "androidx.core_core-animation-testing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.core_core-animation-testing-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.core_core-animation",
-        "junit",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/core/core-animation/1.0.0-rc01/Android.bp b/current/androidx/m2repository/androidx/core/core-animation/1.0.0-rc01/Android.bp
index 26b1b16..4e2d87e 100644
--- a/current/androidx/m2repository/androidx/core/core-animation/1.0.0-rc01/Android.bp
+++ b/current/androidx/m2repository/androidx/core/core-animation/1.0.0-rc01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.core_core-animation-nodeps",
+    name: "androidx.core_core-animation",
     aars: ["core-animation-1.0.0-rc01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "androidx.tracing_tracing",
     ],
 }
-
-android_library {
-    name: "androidx.core_core-animation",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.core_core-animation-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.tracing_tracing",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/core/core-ktx/1.14.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/core/core-ktx/1.14.0-alpha01/Android.bp
index a704120..3036d42 100644
--- a/current/androidx/m2repository/androidx/core/core-ktx/1.14.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/core/core-ktx/1.14.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.core_core-ktx-nodeps",
+    name: "androidx.core_core-ktx",
     aars: ["core-ktx-1.14.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.core_core-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.core_core-ktx-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/core/core-remoteviews/1.1.0-beta02/Android.bp b/current/androidx/m2repository/androidx/core/core-remoteviews/1.1.0-beta02/Android.bp
index 7aa869c..e9ab752 100644
--- a/current/androidx/m2repository/androidx/core/core-remoteviews/1.1.0-beta02/Android.bp
+++ b/current/androidx/m2repository/androidx/core/core-remoteviews/1.1.0-beta02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.core_core-remoteviews-nodeps",
+    name: "androidx.core_core-remoteviews",
     aars: ["core-remoteviews-1.1.0-beta02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.core_core-remoteviews",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.core_core-remoteviews-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/core/core/1.14.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/core/core/1.14.0-alpha01/Android.bp
index 1998ab2..003ad28 100644
--- a/current/androidx/m2repository/androidx/core/core/1.14.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/core/core/1.14.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.core_core-nodeps",
+    name: "androidx.core_core",
     aars: ["core-1.14.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.core_core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.core_core-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.interpolator_interpolator",
-        "androidx.lifecycle_lifecycle-runtime",
-        "androidx.versionedparcelable_versionedparcelable",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/credentials/credentials/1.3.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/credentials/credentials/1.3.0-alpha03/Android.bp
index c7331f1..019a9d6 100644
--- a/current/androidx/m2repository/androidx/credentials/credentials/1.3.0-alpha03/Android.bp
+++ b/current/androidx/m2repository/androidx/credentials/credentials/1.3.0-alpha03/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.credentials_credentials-nodeps",
+    name: "androidx.credentials_credentials",
     aars: ["credentials-1.3.0-alpha03.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.credentials_credentials",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.credentials_credentials-nodeps",
-        "androidx.annotation_annotation",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/cursoradapter/cursoradapter/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/cursoradapter/cursoradapter/1.1.0-alpha01/Android.bp
index fde5666..3a5fcae 100644
--- a/current/androidx/m2repository/androidx/cursoradapter/cursoradapter/1.1.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/cursoradapter/cursoradapter/1.1.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.cursoradapter_cursoradapter-nodeps",
+    name: "androidx.cursoradapter_cursoradapter",
     aars: ["cursoradapter-1.1.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,20 +27,3 @@
         "androidx.annotation_annotation",
     ],
 }
-
-android_library {
-    name: "androidx.cursoradapter_cursoradapter",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.cursoradapter_cursoradapter-nodeps",
-        "androidx.annotation_annotation",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/customview/customview-poolingcontainer/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/customview/customview-poolingcontainer/1.1.0-alpha01/Android.bp
index f5c5e42..59d1e51 100644
--- a/current/androidx/m2repository/androidx/customview/customview-poolingcontainer/1.1.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/customview/customview-poolingcontainer/1.1.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.customview_customview-poolingcontainer-nodeps",
+    name: "androidx.customview_customview-poolingcontainer",
     aars: ["customview-poolingcontainer-1.1.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.customview_customview-poolingcontainer",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.customview_customview-poolingcontainer-nodeps",
-        "androidx.core_core-ktx",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/customview/customview/1.2.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/customview/customview/1.2.0-alpha03/Android.bp
index 20f2c17..6ea2936 100644
--- a/current/androidx/m2repository/androidx/customview/customview/1.2.0-alpha03/Android.bp
+++ b/current/androidx/m2repository/androidx/customview/customview/1.2.0-alpha03/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.customview_customview-nodeps",
+    name: "androidx.customview_customview",
     aars: ["customview-1.2.0-alpha03.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.customview_customview",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.customview_customview-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/datastore/datastore-android/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-android/1.1.0-rc01/Android.bp
index a8ab33d..164499e 100644
--- a/current/androidx/m2repository/androidx/datastore/datastore-android/1.1.0-rc01/Android.bp
+++ b/current/androidx/m2repository/androidx/datastore/datastore-android/1.1.0-rc01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.datastore_datastore-nodeps",
+    name: "androidx.datastore_datastore",
     aars: ["datastore-android-1.1.0-rc01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "okio-lib",
     ],
 }
-
-android_library {
-    name: "androidx.datastore_datastore",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.datastore_datastore-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.datastore_datastore-core",
-        "androidx.datastore_datastore-core-okio",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-        "okio-lib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/datastore/datastore-core-android/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-core-android/1.1.0-rc01/Android.bp
index 4a3ec4c..465d68e 100644
--- a/current/androidx/m2repository/androidx/datastore/datastore-core-android/1.1.0-rc01/Android.bp
+++ b/current/androidx/m2repository/androidx/datastore/datastore-core-android/1.1.0-rc01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.datastore_datastore-core-nodeps",
+    name: "androidx.datastore_datastore-core",
     aars: ["datastore-core-android-1.1.0-rc01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.datastore_datastore-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.datastore_datastore-core-nodeps",
-        "androidx.annotation_annotation",
-        "kotlin-parcelize-runtime",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/datastore/datastore-core-okio-jvm/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-core-okio-jvm/1.1.0-rc01/Android.bp
index e632104..ec70613 100644
--- a/current/androidx/m2repository/androidx/datastore/datastore-core-okio-jvm/1.1.0-rc01/Android.bp
+++ b/current/androidx/m2repository/androidx/datastore/datastore-core-okio-jvm/1.1.0-rc01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.datastore_datastore-core-okio-nodeps",
+    name: "androidx.datastore_datastore-core-okio",
     jars: ["datastore-core-okio-jvm-1.1.0-rc01.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,23 +23,10 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.datastore_datastore-core-okio",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.datastore_datastore-core-okio-nodeps",
         "androidx.datastore_datastore-core",
         "kotlin-stdlib",
         "kotlinx_coroutines",
         "okio-lib",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/datastore/datastore-preferences-android/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-preferences-android/1.1.0-rc01/Android.bp
index 1e76a71..a06824e 100644
--- a/current/androidx/m2repository/androidx/datastore/datastore-preferences-android/1.1.0-rc01/Android.bp
+++ b/current/androidx/m2repository/androidx/datastore/datastore-preferences-android/1.1.0-rc01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.datastore_datastore-preferences-nodeps",
+    name: "androidx.datastore_datastore-preferences",
     aars: ["datastore-preferences-android-1.1.0-rc01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.datastore_datastore-preferences",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.datastore_datastore-preferences-nodeps",
-        "androidx.datastore_datastore",
-        "androidx.datastore_datastore-preferences-core",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/datastore/datastore-preferences-core-jvm/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-preferences-core-jvm/1.1.0-rc01/Android.bp
index d51dc64..50e4028 100644
--- a/current/androidx/m2repository/androidx/datastore/datastore-preferences-core-jvm/1.1.0-rc01/Android.bp
+++ b/current/androidx/m2repository/androidx/datastore/datastore-preferences-core-jvm/1.1.0-rc01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.datastore_datastore-preferences-core-nodeps",
+    name: "androidx.datastore_datastore-preferences-core",
     jars: ["datastore-preferences-core-jvm-1.1.0-rc01.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,23 +23,10 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.datastore_datastore-preferences-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.datastore_datastore-preferences-core-nodeps",
         "androidx.datastore_datastore-core",
         "androidx.datastore_datastore-core-okio",
         "kotlin-stdlib",
         "okio-lib",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/datastore/datastore-preferences-rxjava2/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-preferences-rxjava2/1.1.0-rc01/Android.bp
index 8f333d1..595e197 100644
--- a/current/androidx/m2repository/androidx/datastore/datastore-preferences-rxjava2/1.1.0-rc01/Android.bp
+++ b/current/androidx/m2repository/androidx/datastore/datastore-preferences-rxjava2/1.1.0-rc01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.datastore_datastore-preferences-rxjava2-nodeps",
+    name: "androidx.datastore_datastore-preferences-rxjava2",
     aars: ["datastore-preferences-rxjava2-1.1.0-rc01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "rxjava",
     ],
 }
-
-android_library {
-    name: "androidx.datastore_datastore-preferences-rxjava2",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.datastore_datastore-preferences-rxjava2-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.datastore_datastore",
-        "androidx.datastore_datastore-preferences",
-        "androidx.datastore_datastore-rxjava2",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-        "kotlinx_coroutines_rx2",
-        "rxjava",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/datastore/datastore-rxjava2/1.1.0-rc01/Android.bp b/current/androidx/m2repository/androidx/datastore/datastore-rxjava2/1.1.0-rc01/Android.bp
index 207c948..b868f7d 100644
--- a/current/androidx/m2repository/androidx/datastore/datastore-rxjava2/1.1.0-rc01/Android.bp
+++ b/current/androidx/m2repository/androidx/datastore/datastore-rxjava2/1.1.0-rc01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.datastore_datastore-rxjava2-nodeps",
+    name: "androidx.datastore_datastore-rxjava2",
     aars: ["datastore-rxjava2-1.1.0-rc01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "rxjava",
     ],
 }
-
-android_library {
-    name: "androidx.datastore_datastore-rxjava2",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.datastore_datastore-rxjava2-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.datastore_datastore",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-        "kotlinx_coroutines_rx2",
-        "rxjava",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/documentfile/documentfile/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/documentfile/documentfile/1.1.0-alpha02/Android.bp
index cf11439..e1e8a6e 100644
--- a/current/androidx/m2repository/androidx/documentfile/documentfile/1.1.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/documentfile/documentfile/1.1.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.documentfile_documentfile-nodeps",
+    name: "androidx.documentfile_documentfile",
     aars: ["documentfile-1.1.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.documentfile_documentfile",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.documentfile_documentfile-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/drawerlayout/drawerlayout/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/drawerlayout/drawerlayout/1.3.0-alpha01/Android.bp
index 0d00283..14f6bd4 100644
--- a/current/androidx/m2repository/androidx/drawerlayout/drawerlayout/1.3.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/drawerlayout/drawerlayout/1.3.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.drawerlayout_drawerlayout-nodeps",
+    name: "androidx.drawerlayout_drawerlayout",
     aars: ["drawerlayout-1.3.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "androidx.customview_customview",
     ],
 }
-
-android_library {
-    name: "androidx.drawerlayout_drawerlayout",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.drawerlayout_drawerlayout-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.customview_customview",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/Android.bp
index ca3a188..ef6d669 100644
--- a/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/dynamicanimation/dynamicanimation/1.1.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.dynamicanimation_dynamicanimation-nodeps",
+    name: "androidx.dynamicanimation_dynamicanimation",
     aars: ["dynamicanimation-1.1.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.dynamicanimation_dynamicanimation",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.dynamicanimation_dynamicanimation-nodeps",
-        "androidx.collection_collection",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/emoji/emoji-appcompat/1.2.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/emoji/emoji-appcompat/1.2.0-alpha03/Android.bp
index 767e64f..a1eee6e 100644
--- a/current/androidx/m2repository/androidx/emoji/emoji-appcompat/1.2.0-alpha03/Android.bp
+++ b/current/androidx/m2repository/androidx/emoji/emoji-appcompat/1.2.0-alpha03/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.emoji_emoji-appcompat-nodeps",
+    name: "androidx.emoji_emoji-appcompat",
     aars: ["emoji-appcompat-1.2.0-alpha03.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.emoji_emoji",
     ],
 }
-
-android_library {
-    name: "androidx.emoji_emoji-appcompat",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.emoji_emoji-appcompat-nodeps",
-        "androidx.appcompat_appcompat",
-        "androidx.emoji_emoji",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/emoji/emoji-bundled/1.2.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/emoji/emoji-bundled/1.2.0-alpha03/Android.bp
index ac1383a..bc34e45 100644
--- a/current/androidx/m2repository/androidx/emoji/emoji-bundled/1.2.0-alpha03/Android.bp
+++ b/current/androidx/m2repository/androidx/emoji/emoji-bundled/1.2.0-alpha03/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.emoji_emoji-bundled-nodeps",
+    name: "androidx.emoji_emoji-bundled",
     aars: ["emoji-bundled-1.2.0-alpha03.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,20 +27,3 @@
         "androidx.emoji_emoji",
     ],
 }
-
-android_library {
-    name: "androidx.emoji_emoji-bundled",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.emoji_emoji-bundled-nodeps",
-        "androidx.emoji_emoji",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/emoji/emoji/1.2.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/emoji/emoji/1.2.0-alpha03/Android.bp
index 408e3b1..08e92c4 100644
--- a/current/androidx/m2repository/androidx/emoji/emoji/1.2.0-alpha03/Android.bp
+++ b/current/androidx/m2repository/androidx/emoji/emoji/1.2.0-alpha03/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.emoji_emoji-nodeps",
+    name: "androidx.emoji_emoji",
     aars: ["emoji-1.2.0-alpha03.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.emoji_emoji",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.emoji_emoji-nodeps",
-        "androidx.collection_collection",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/emoji2/emoji2-views-helper/1.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/emoji2/emoji2-views-helper/1.5.0-alpha01/Android.bp
index 44bdaf3..6b11995 100644
--- a/current/androidx/m2repository/androidx/emoji2/emoji2-views-helper/1.5.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/emoji2/emoji2-views-helper/1.5.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.emoji2_emoji2-views-helper-nodeps",
+    name: "androidx.emoji2_emoji2-views-helper",
     aars: ["emoji2-views-helper-1.5.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "androidx.emoji2_emoji2",
     ],
 }
-
-android_library {
-    name: "androidx.emoji2_emoji2-views-helper",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.emoji2_emoji2-views-helper-nodeps",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.emoji2_emoji2",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/emoji2/emoji2/1.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/emoji2/emoji2/1.5.0-alpha01/Android.bp
index 5e582e5..6d31e36 100644
--- a/current/androidx/m2repository/androidx/emoji2/emoji2/1.5.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/emoji2/emoji2/1.5.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.emoji2_emoji2-nodeps",
+    name: "androidx.emoji2_emoji2",
     aars: ["emoji2-1.5.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "androidx.startup_startup-runtime",
     ],
 }
-
-android_library {
-    name: "androidx.emoji2_emoji2",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.emoji2_emoji2-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.lifecycle_lifecycle-process",
-        "androidx.startup_startup-runtime",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/exifinterface/exifinterface/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/exifinterface/exifinterface/1.4.0-alpha01/Android.bp
index 724e8a7..3d8894f 100644
--- a/current/androidx/m2repository/androidx/exifinterface/exifinterface/1.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/exifinterface/exifinterface/1.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.exifinterface_exifinterface-nodeps",
+    name: "androidx.exifinterface_exifinterface",
     aars: ["exifinterface-1.4.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,20 +27,3 @@
         "androidx.annotation_annotation",
     ],
 }
-
-android_library {
-    name: "androidx.exifinterface_exifinterface",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.exifinterface_exifinterface-nodeps",
-        "androidx.annotation_annotation",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/fragment/fragment-ktx/1.8.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/fragment/fragment-ktx/1.8.0-alpha02/Android.bp
index f5f431c..f75fc3c 100644
--- a/current/androidx/m2repository/androidx/fragment/fragment-ktx/1.8.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/fragment/fragment-ktx/1.8.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.fragment_fragment-ktx-nodeps",
+    name: "androidx.fragment_fragment-ktx",
     aars: ["fragment-ktx-1.8.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.fragment_fragment-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.fragment_fragment-ktx-nodeps",
-        "androidx.activity_activity-ktx",
-        "androidx.collection_collection-ktx",
-        "androidx.core_core-ktx",
-        "androidx.fragment_fragment",
-        "androidx.lifecycle_lifecycle-livedata-core-ktx",
-        "androidx.lifecycle_lifecycle-viewmodel-ktx",
-        "androidx.savedstate_savedstate-ktx",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/fragment/fragment-testing-manifest/1.8.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/fragment/fragment-testing-manifest/1.8.0-alpha02/Android.bp
index e7bcd85..087d5cf 100644
--- a/current/androidx/m2repository/androidx/fragment/fragment-testing-manifest/1.8.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/fragment/fragment-testing-manifest/1.8.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.fragment_fragment-testing-manifest-nodeps",
+    name: "androidx.fragment_fragment-testing-manifest",
     aars: ["fragment-testing-manifest-1.8.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.fragment_fragment-testing-manifest",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.fragment_fragment-testing-manifest-nodeps",
-        "androidx.fragment_fragment-ktx",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/fragment/fragment-testing/1.8.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/fragment/fragment-testing/1.8.0-alpha02/Android.bp
index 5197886..a6dcf63 100644
--- a/current/androidx/m2repository/androidx/fragment/fragment-testing/1.8.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/fragment/fragment-testing/1.8.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.fragment_fragment-testing-nodeps",
+    name: "androidx.fragment_fragment-testing",
     aars: ["fragment-testing-1.8.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.fragment_fragment-testing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.fragment_fragment-testing-nodeps",
-        "androidx.fragment_fragment-ktx",
-        "androidx.fragment_fragment-testing-manifest",
-        "androidx.test.core",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/fragment/fragment/1.8.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/fragment/fragment/1.8.0-alpha02/Android.bp
index 36b3ef3..22fc86e 100644
--- a/current/androidx/m2repository/androidx/fragment/fragment/1.8.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/fragment/fragment/1.8.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.fragment_fragment-nodeps",
+    name: "androidx.fragment_fragment",
     aars: ["fragment-1.8.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -40,33 +40,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.fragment_fragment",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.fragment_fragment-nodeps",
-        "androidx.activity_activity",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.core_core-ktx",
-        "androidx.lifecycle_lifecycle-livedata-core",
-        "androidx.lifecycle_lifecycle-runtime",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "androidx.lifecycle_lifecycle-viewmodel-savedstate",
-        "androidx.loader_loader",
-        "androidx.profileinstaller_profileinstaller",
-        "androidx.savedstate_savedstate",
-        "androidx.viewpager_viewpager",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/glance/glance-appwidget-preview/1.0.0-alpha06/Android.bp b/current/androidx/m2repository/androidx/glance/glance-appwidget-preview/1.0.0-alpha06/Android.bp
index ca9bc72..caa406c 100644
--- a/current/androidx/m2repository/androidx/glance/glance-appwidget-preview/1.0.0-alpha06/Android.bp
+++ b/current/androidx/m2repository/androidx/glance/glance-appwidget-preview/1.0.0-alpha06/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.glance_glance-appwidget-preview-nodeps",
+    name: "androidx.glance_glance-appwidget-preview",
     aars: ["glance-appwidget-preview-1.0.0-alpha06.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.glance_glance-appwidget-preview",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.glance_glance-appwidget-preview-nodeps",
-        "androidx.compose.runtime_runtime",
-        "androidx.core_core",
-        "androidx.glance_glance",
-        "androidx.glance_glance-appwidget",
-        "kotlin-reflect",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/glance/glance-appwidget-samples/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-appwidget-samples/1.1.0-beta01/Android.bp
index 3506e1e..8224c02 100644
--- a/current/androidx/m2repository/androidx/glance/glance-appwidget-samples/1.1.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/glance/glance-appwidget-samples/1.1.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.glance_glance-appwidget-samples-nodeps",
+    name: "androidx.glance_glance-appwidget-samples",
     aars: ["glance-appwidget-samples-1.1.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.glance_glance-appwidget-samples",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.glance_glance-appwidget-samples-nodeps",
-        "androidx.core_core",
-        "androidx.glance_glance",
-        "androidx.glance_glance-appwidget",
-        "androidx.work_work-runtime",
-        "androidx.work_work-runtime-ktx",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/glance/glance-appwidget-testing-samples/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-appwidget-testing-samples/1.1.0-beta01/Android.bp
index 4611c70..d2aeb73 100644
--- a/current/androidx/m2repository/androidx/glance/glance-appwidget-testing-samples/1.1.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/glance/glance-appwidget-testing-samples/1.1.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.glance_glance-appwidget-testing-samples-nodeps",
+    name: "androidx.glance_glance-appwidget-testing-samples",
     aars: ["glance-appwidget-testing-samples-1.1.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.glance_glance-appwidget-testing-samples",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "23",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.glance_glance-appwidget-testing-samples-nodeps",
-        "androidx.core_core",
-        "androidx.core_core-ktx",
-        "androidx.glance_glance",
-        "androidx.glance_glance-appwidget-testing",
-        "androidx.glance_glance-testing",
-        "androidx.test.core",
-        "junit",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/glance/glance-appwidget-testing/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-appwidget-testing/1.1.0-beta01/Android.bp
index 29c7e75..a5dc576 100644
--- a/current/androidx/m2repository/androidx/glance/glance-appwidget-testing/1.1.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/glance/glance-appwidget-testing/1.1.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.glance_glance-appwidget-testing-nodeps",
+    name: "androidx.glance_glance-appwidget-testing",
     aars: ["glance-appwidget-testing-1.1.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlinx_coroutines_test",
     ],
 }
-
-android_library {
-    name: "androidx.glance_glance-appwidget-testing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "23",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.glance_glance-appwidget-testing-nodeps",
-        "androidx.glance_glance-appwidget",
-        "androidx.glance_glance-testing",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_test",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/glance/glance-appwidget/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-appwidget/1.1.0-beta01/Android.bp
index 0ace14f..d7eda19 100644
--- a/current/androidx/m2repository/androidx/glance/glance-appwidget/1.1.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/glance/glance-appwidget/1.1.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.glance_glance-appwidget-nodeps",
+    name: "androidx.glance_glance-appwidget",
     aars: ["glance-appwidget-1.1.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -38,31 +38,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.glance_glance-appwidget",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.glance_glance-appwidget-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui-graphics",
-        "androidx.compose.ui_ui-unit",
-        "androidx.core_core-ktx",
-        "androidx.core_core-remoteviews",
-        "androidx.datastore_datastore",
-        "androidx.datastore_datastore-core",
-        "androidx.datastore_datastore-preferences",
-        "androidx.datastore_datastore-preferences-core",
-        "androidx.glance_glance",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/glance/glance-material/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-material/1.1.0-beta01/Android.bp
index 930501a..13a23a7 100644
--- a/current/androidx/m2repository/androidx/glance/glance-material/1.1.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/glance/glance-material/1.1.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.glance_glance-material-nodeps",
+    name: "androidx.glance_glance-material",
     aars: ["glance-material-1.1.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.glance_glance-material",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.glance_glance-material-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.compose.material_material",
-        "androidx.compose.runtime_runtime",
-        "androidx.glance_glance",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/glance/glance-material3/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-material3/1.1.0-beta01/Android.bp
index 2d33b92..353cd64 100644
--- a/current/androidx/m2repository/androidx/glance/glance-material3/1.1.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/glance/glance-material3/1.1.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.glance_glance-material3-nodeps",
+    name: "androidx.glance_glance-material3",
     aars: ["glance-material3-1.1.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.glance_glance-material3",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.glance_glance-material3-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.compose.material3_material3",
-        "androidx.compose.runtime_runtime",
-        "androidx.core_core",
-        "androidx.glance_glance",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/glance/glance-preview/1.0.0-alpha06/Android.bp b/current/androidx/m2repository/androidx/glance/glance-preview/1.0.0-alpha06/Android.bp
index d26ea29..e3903bc 100644
--- a/current/androidx/m2repository/androidx/glance/glance-preview/1.0.0-alpha06/Android.bp
+++ b/current/androidx/m2repository/androidx/glance/glance-preview/1.0.0-alpha06/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.glance_glance-preview-nodeps",
+    name: "androidx.glance_glance-preview",
     aars: ["glance-preview-1.0.0-alpha06.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.glance_glance-preview",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.glance_glance-preview-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.compose.runtime_runtime",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/glance/glance-template/1.0.0-alpha06/Android.bp b/current/androidx/m2repository/androidx/glance/glance-template/1.0.0-alpha06/Android.bp
index 177b51e..7ff0280 100644
--- a/current/androidx/m2repository/androidx/glance/glance-template/1.0.0-alpha06/Android.bp
+++ b/current/androidx/m2repository/androidx/glance/glance-template/1.0.0-alpha06/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.glance_glance-template-nodeps",
+    name: "androidx.glance_glance-template",
     aars: ["glance-template-1.0.0-alpha06.aar"],
     sdk_version: "34",
     apex_available: [
@@ -39,32 +39,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.glance_glance-template",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.glance_glance-template-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui-graphics",
-        "androidx.compose.ui_ui-unit",
-        "androidx.datastore_datastore-core",
-        "androidx.datastore_datastore-preferences",
-        "androidx.datastore_datastore-preferences-core",
-        "androidx.glance_glance",
-        "androidx.glance_glance-appwidget",
-        "androidx.work_work-runtime",
-        "androidx.work_work-runtime-ktx",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/glance/glance-testing/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance-testing/1.1.0-beta01/Android.bp
index 3f411d2..c7995ae 100644
--- a/current/androidx/m2repository/androidx/glance/glance-testing/1.1.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/glance/glance-testing/1.1.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.glance_glance-testing-nodeps",
+    name: "androidx.glance_glance-testing",
     aars: ["glance-testing-1.1.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.glance_glance-testing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "23",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.glance_glance-testing-nodeps",
-        "androidx.glance_glance",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/glance/glance-wear-tiles/1.0.0-alpha06/Android.bp b/current/androidx/m2repository/androidx/glance/glance-wear-tiles/1.0.0-alpha06/Android.bp
index 9caf3b6..f88600d 100644
--- a/current/androidx/m2repository/androidx/glance/glance-wear-tiles/1.0.0-alpha06/Android.bp
+++ b/current/androidx/m2repository/androidx/glance/glance-wear-tiles/1.0.0-alpha06/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.glance_glance-wear-tiles-nodeps",
+    name: "androidx.glance_glance-wear-tiles",
     aars: ["glance-wear-tiles-1.0.0-alpha06.aar"],
     sdk_version: "34",
     apex_available: [
@@ -36,29 +36,3 @@
         "kotlinx_coroutines_guava",
     ],
 }
-
-android_library {
-    name: "androidx.glance_glance-wear-tiles",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.glance_glance-wear-tiles-nodeps",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui-graphics",
-        "androidx.compose.ui_ui-unit",
-        "androidx.glance_glance",
-        "androidx.glance_glance-template",
-        "androidx.lifecycle_lifecycle-runtime-ktx",
-        "androidx.lifecycle_lifecycle-service",
-        "androidx.wear.tiles_tiles",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_guava",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/glance/glance/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/glance/glance/1.1.0-beta01/Android.bp
index a30f01b..0cfafb4 100644
--- a/current/androidx/m2repository/androidx/glance/glance/1.1.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/glance/glance/1.1.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.glance_glance-nodeps",
+    name: "androidx.glance_glance",
     aars: ["glance-1.1.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -38,31 +38,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.glance_glance",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.glance_glance-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui-graphics",
-        "androidx.compose.ui_ui-unit",
-        "androidx.concurrent_concurrent-futures-ktx",
-        "androidx.datastore_datastore-core",
-        "androidx.datastore_datastore-preferences",
-        "androidx.datastore_datastore-preferences-core",
-        "androidx.work_work-runtime",
-        "androidx.work_work-runtime-ktx",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/graphics/graphics-path/1.0.0-rc01/Android.bp b/current/androidx/m2repository/androidx/graphics/graphics-path/1.0.0-rc01/Android.bp
index 4f4fb83..03f200a 100644
--- a/current/androidx/m2repository/androidx/graphics/graphics-path/1.0.0-rc01/Android.bp
+++ b/current/androidx/m2repository/androidx/graphics/graphics-path/1.0.0-rc01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.graphics_graphics-path-nodeps",
+    name: "androidx.graphics_graphics-path",
     aars: ["graphics-path-1.0.0-rc01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.graphics_graphics-path",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.graphics_graphics-path-nodeps",
-        "androidx.core_core",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/gridlayout/gridlayout/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/gridlayout/gridlayout/1.1.0-alpha02/Android.bp
index 0a30015..e59634d 100644
--- a/current/androidx/m2repository/androidx/gridlayout/gridlayout/1.1.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/gridlayout/gridlayout/1.1.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.gridlayout_gridlayout-nodeps",
+    name: "androidx.gridlayout_gridlayout",
     aars: ["gridlayout-1.1.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.gridlayout_gridlayout",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.gridlayout_gridlayout-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/health/health-services-client/1.0.0-beta03/Android.bp b/current/androidx/m2repository/androidx/health/health-services-client/1.0.0-beta03/Android.bp
index 9079dfd..a2ab1a1 100644
--- a/current/androidx/m2repository/androidx/health/health-services-client/1.0.0-beta03/Android.bp
+++ b/current/androidx/m2repository/androidx/health/health-services-client/1.0.0-beta03/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.health_health-services-client-nodeps",
+    name: "androidx.health_health-services-client",
     aars: ["health-services-client-1.0.0-beta03.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "libprotobuf-java-lite",
     ],
 }
-
-android_library {
-    name: "androidx.health_health-services-client",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "30",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.health_health-services-client-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.concurrent_concurrent-futures-ktx",
-        "androidx.core_core-ktx",
-        "guava",
-        "guava-listenablefuture-prebuilt-jar",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-        "libprotobuf-java-lite",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha02/Android.bp
index e55dd7b..fd5bdf4 100644
--- a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.heifwriter_heifwriter-nodeps",
+    name: "androidx.heifwriter_heifwriter",
     aars: ["heifwriter-1.1.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,20 +27,3 @@
         "androidx.annotation_annotation",
     ],
 }
-
-android_library {
-    name: "androidx.heifwriter_heifwriter",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "28",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.heifwriter_heifwriter-nodeps",
-        "androidx.annotation_annotation",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/hilt/hilt-navigation-compose/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/hilt/hilt-navigation-compose/1.1.0-beta01/Android.bp
index 2f013be..d2c3993 100644
--- a/current/androidx/m2repository/androidx/hilt/hilt-navigation-compose/1.1.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/hilt/hilt-navigation-compose/1.1.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.hilt_hilt-navigation-compose-nodeps",
+    name: "androidx.hilt_hilt-navigation-compose",
     aars: ["hilt-navigation-compose-1.1.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.hilt_hilt-navigation-compose",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.hilt_hilt-navigation-compose-nodeps",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.hilt_hilt-navigation",
-        "androidx.lifecycle_lifecycle-viewmodel-compose",
-        "androidx.navigation_navigation-compose",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/hilt/hilt-navigation/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/hilt/hilt-navigation/1.1.0-beta01/Android.bp
index f1a8e6b..71bb18f 100644
--- a/current/androidx/m2repository/androidx/hilt/hilt-navigation/1.1.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/hilt/hilt-navigation/1.1.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.hilt_hilt-navigation-nodeps",
+    name: "androidx.hilt_hilt-navigation",
     aars: ["hilt-navigation-1.1.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.hilt_hilt-navigation",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.hilt_hilt-navigation-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.navigation_navigation-runtime",
-        "hilt_android",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/interpolator/interpolator/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/interpolator/interpolator/1.1.0-alpha01/Android.bp
index 48a3181..68622da 100644
--- a/current/androidx/m2repository/androidx/interpolator/interpolator/1.1.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/interpolator/interpolator/1.1.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.interpolator_interpolator-nodeps",
+    name: "androidx.interpolator_interpolator",
     aars: ["interpolator-1.1.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,20 +27,3 @@
         "androidx.annotation_annotation",
     ],
 }
-
-android_library {
-    name: "androidx.interpolator_interpolator",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.interpolator_interpolator-nodeps",
-        "androidx.annotation_annotation",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/javascriptengine/javascriptengine/1.0.0-alpha06/Android.bp b/current/androidx/m2repository/androidx/javascriptengine/javascriptengine/1.0.0-alpha06/Android.bp
index 20701ee..7340142 100644
--- a/current/androidx/m2repository/androidx/javascriptengine/javascriptengine/1.0.0-alpha06/Android.bp
+++ b/current/androidx/m2repository/androidx/javascriptengine/javascriptengine/1.0.0-alpha06/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.javascriptengine_javascriptengine-nodeps",
+    name: "androidx.javascriptengine_javascriptengine",
     aars: ["javascriptengine-1.0.0-alpha06.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "guava",
     ],
 }
-
-android_library {
-    name: "androidx.javascriptengine_javascriptengine",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.javascriptengine_javascriptengine-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.core_core",
-        "guava",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/leanback/leanback-grid/1.0.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/leanback/leanback-grid/1.0.0-alpha02/Android.bp
index 0a0b501..4288bed 100644
--- a/current/androidx/m2repository/androidx/leanback/leanback-grid/1.0.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/leanback/leanback-grid/1.0.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.leanback_leanback-grid-nodeps",
+    name: "androidx.leanback_leanback-grid",
     aars: ["leanback-grid-1.0.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "androidx.recyclerview_recyclerview",
     ],
 }
-
-android_library {
-    name: "androidx.leanback_leanback-grid",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.leanback_leanback-grid-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.recyclerview_recyclerview",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/leanback/leanback-preference/1.2.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/leanback/leanback-preference/1.2.0-alpha03/Android.bp
index 2cd5366..1c88323 100644
--- a/current/androidx/m2repository/androidx/leanback/leanback-preference/1.2.0-alpha03/Android.bp
+++ b/current/androidx/m2repository/androidx/leanback/leanback-preference/1.2.0-alpha03/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.leanback_leanback-preference-nodeps",
+    name: "androidx.leanback_leanback-preference",
     aars: ["leanback-preference-1.2.0-alpha03.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "androidx.recyclerview_recyclerview",
     ],
 }
-
-android_library {
-    name: "androidx.leanback_leanback-preference",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.leanback_leanback-preference-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.appcompat_appcompat",
-        "androidx.collection_collection",
-        "androidx.leanback_leanback",
-        "androidx.preference_preference",
-        "androidx.recyclerview_recyclerview",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/leanback/leanback/1.2.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/leanback/leanback/1.2.0-alpha03/Android.bp
index 0d820c2..4e71308 100644
--- a/current/androidx/m2repository/androidx/leanback/leanback/1.2.0-alpha03/Android.bp
+++ b/current/androidx/m2repository/androidx/leanback/leanback/1.2.0-alpha03/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.leanback_leanback-nodeps",
+    name: "androidx.leanback_leanback",
     aars: ["leanback-1.2.0-alpha03.aar"],
     sdk_version: "34",
     apex_available: [
@@ -35,28 +35,3 @@
         "androidx.vectordrawable_vectordrawable-animated",
     ],
 }
-
-android_library {
-    name: "androidx.leanback_leanback",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.leanback_leanback-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.appcompat_appcompat",
-        "androidx.core_core",
-        "androidx.fragment_fragment",
-        "androidx.interpolator_interpolator",
-        "androidx.leanback_leanback-grid",
-        "androidx.media_media",
-        "androidx.recyclerview_recyclerview",
-        "androidx.vectordrawable_vectordrawable-animated",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-java8/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-java8/2.8.0-alpha04/Android.bp
index cac0da9..8fec36c 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-java8/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-java8/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.lifecycle_lifecycle-common-java8-nodeps",
+    name: "androidx.lifecycle_lifecycle-common-java8",
     jars: ["lifecycle-common-java8-2.8.0-alpha04.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,21 +23,8 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.lifecycle_lifecycle-common-java8",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.lifecycle_lifecycle-common-java8-nodeps",
         "androidx.annotation_annotation",
         "androidx.lifecycle_lifecycle-common",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-jvm/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-jvm/2.8.0-alpha04/Android.bp
index 0773e8a..32bcaea 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-jvm/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-common-jvm/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.lifecycle_lifecycle-common-nodeps",
+    name: "androidx.lifecycle_lifecycle-common",
     jars: ["lifecycle-common-jvm-2.8.0-alpha04.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,22 +23,9 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.lifecycle_lifecycle-common",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.lifecycle_lifecycle-common-nodeps",
         "androidx.annotation_annotation",
         "kotlin-stdlib",
         "kotlinx_coroutines",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core-ktx/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core-ktx/2.8.0-alpha04/Android.bp
index c403c67..bb5cafa 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core-ktx/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core-ktx/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-livedata-core-ktx-nodeps",
+    name: "androidx.lifecycle_lifecycle-livedata-core-ktx",
     aars: ["lifecycle-livedata-core-ktx-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-livedata-core-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-livedata-core-ktx-nodeps",
-        "androidx.lifecycle_lifecycle-livedata-core",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core/2.8.0-alpha04/Android.bp
index d40a61e..3534487 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-core/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-livedata-core-nodeps",
+    name: "androidx.lifecycle_lifecycle-livedata-core",
     aars: ["lifecycle-livedata-core-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-livedata-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-livedata-core-nodeps",
-        "androidx.arch.core_core-common",
-        "androidx.arch.core_core-runtime",
-        "androidx.lifecycle_lifecycle-common",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-ktx/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-ktx/2.8.0-alpha04/Android.bp
index f42cdca..de50fde 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-ktx/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata-ktx/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-livedata-ktx-nodeps",
+    name: "androidx.lifecycle_lifecycle-livedata-ktx",
     aars: ["lifecycle-livedata-ktx-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-livedata-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-livedata-ktx-nodeps",
-        "androidx.lifecycle_lifecycle-livedata",
-        "androidx.lifecycle_lifecycle-livedata-core-ktx",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata/2.8.0-alpha04/Android.bp
index a575818..0ce0484 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-livedata-nodeps",
+    name: "androidx.lifecycle_lifecycle-livedata",
     aars: ["lifecycle-livedata-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-livedata",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-livedata-nodeps",
-        "androidx.arch.core_core-common",
-        "androidx.arch.core_core-runtime",
-        "androidx.lifecycle_lifecycle-livedata-core",
-        "androidx.lifecycle_lifecycle-livedata-core-ktx",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-process/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-process/2.8.0-alpha04/Android.bp
index 882189b..4717d99 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-process/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-process/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-process-nodeps",
+    name: "androidx.lifecycle_lifecycle-process",
     aars: ["lifecycle-process-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-process",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-process-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.lifecycle_lifecycle-runtime",
-        "androidx.startup_startup-runtime",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-android/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-android/2.8.0-alpha04/Android.bp
index be215d1..3f8e617 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-android/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-android/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-runtime-nodeps",
+    name: "androidx.lifecycle_lifecycle-runtime",
     aars: ["lifecycle-runtime-android-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-runtime",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-runtime-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.arch.core_core-common",
-        "androidx.arch.core_core-runtime",
-        "androidx.lifecycle_lifecycle-common",
-        "androidx.profileinstaller_profileinstaller",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-compose-android/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-compose-android/2.8.0-alpha04/Android.bp
index 5dd834f..e7a0bbc 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-compose-android/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-compose-android/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-runtime-compose-nodeps",
+    name: "androidx.lifecycle_lifecycle-runtime-compose",
     aars: ["lifecycle-runtime-compose-android-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "androidx.lifecycle_lifecycle-runtime-ktx",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-runtime-compose",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-runtime-compose-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.compose.runtime_runtime",
-        "androidx.lifecycle_lifecycle-runtime",
-        "androidx.lifecycle_lifecycle-runtime-ktx",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-ktx-android/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-ktx-android/2.8.0-alpha04/Android.bp
index 197d8d7..e14f0a7 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-ktx-android/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-ktx-android/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-runtime-ktx-nodeps",
+    name: "androidx.lifecycle_lifecycle-runtime-ktx",
     aars: ["lifecycle-runtime-ktx-android-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-runtime-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-runtime-ktx-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.lifecycle_lifecycle-runtime",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-testing/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-testing/2.8.0-alpha04/Android.bp
index 1caa9b8..b6a80dd 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-testing/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-runtime-testing/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-runtime-testing-nodeps",
+    name: "androidx.lifecycle_lifecycle-runtime-testing",
     aars: ["lifecycle-runtime-testing-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-runtime-testing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-runtime-testing-nodeps",
-        "androidx.lifecycle_lifecycle-runtime-ktx",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-service/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-service/2.8.0-alpha04/Android.bp
index 5322451..658ac43 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-service/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-service/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-service-nodeps",
+    name: "androidx.lifecycle_lifecycle-service",
     aars: ["lifecycle-service-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-service",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-service-nodeps",
-        "androidx.lifecycle_lifecycle-runtime",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-android/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-android/2.8.0-alpha04/Android.bp
index c8f788e..ccc53b8 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-android/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-android/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-viewmodel-nodeps",
+    name: "androidx.lifecycle_lifecycle-viewmodel",
     aars: ["lifecycle-viewmodel-android-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-viewmodel",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-viewmodel-nodeps",
-        "androidx.annotation_annotation",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-compose-android/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-compose-android/2.8.0-alpha04/Android.bp
index 9a1485b..15e754c 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-compose-android/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-compose-android/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-viewmodel-compose-nodeps",
+    name: "androidx.lifecycle_lifecycle-viewmodel-compose",
     aars: ["lifecycle-viewmodel-compose-android-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-viewmodel-compose",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-viewmodel-compose-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.lifecycle_lifecycle-common",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "androidx.lifecycle_lifecycle-viewmodel-savedstate",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-ktx/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-ktx/2.8.0-alpha04/Android.bp
index 8dd94eb..43b772c 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-ktx/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-ktx/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-viewmodel-ktx-nodeps",
+    name: "androidx.lifecycle_lifecycle-viewmodel-ktx",
     aars: ["lifecycle-viewmodel-ktx-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-viewmodel-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-viewmodel-ktx-nodeps",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.8.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.8.0-alpha04/Android.bp
index 6bef220..c7e720d 100644
--- a/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.8.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.8.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.lifecycle_lifecycle-viewmodel-savedstate-nodeps",
+    name: "androidx.lifecycle_lifecycle-viewmodel-savedstate",
     aars: ["lifecycle-viewmodel-savedstate-2.8.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.lifecycle_lifecycle-viewmodel-savedstate",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.lifecycle_lifecycle-viewmodel-savedstate-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core-ktx",
-        "androidx.lifecycle_lifecycle-livedata-core",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "androidx.savedstate_savedstate",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/loader/loader/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/loader/loader/1.2.0-alpha01/Android.bp
index 10845bc..accdbab 100644
--- a/current/androidx/m2repository/androidx/loader/loader/1.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/loader/loader/1.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.loader_loader-nodeps",
+    name: "androidx.loader_loader",
     aars: ["loader-1.2.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "androidx.lifecycle_lifecycle-viewmodel",
     ],
 }
-
-android_library {
-    name: "androidx.loader_loader",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.loader_loader-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.lifecycle_lifecycle-livedata-core",
-        "androidx.lifecycle_lifecycle-viewmodel",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/media/media/1.7.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/media/media/1.7.0-alpha02/Android.bp
index 0e50e5f..fd951f8 100644
--- a/current/androidx/m2repository/androidx/media/media/1.7.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/media/media/1.7.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.media_media-nodeps",
+    name: "androidx.media_media",
     aars: ["media-1.7.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.media_media",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.media_media-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/media2/media2-common/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/media2/media2-common/1.3.0-alpha01/Android.bp
index 35a2b1a..4b8af42 100644
--- a/current/androidx/m2repository/androidx/media2/media2-common/1.3.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/media2/media2-common/1.3.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.media2_media2-common-nodeps",
+    name: "androidx.media2_media2-common",
     aars: ["media2-common-1.3.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "guava-listenablefuture-prebuilt-jar",
     ],
 }
-
-android_library {
-    name: "androidx.media2_media2-common",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.media2_media2-common-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.core_core",
-        "androidx.media_media",
-        "androidx.versionedparcelable_versionedparcelable",
-        "guava-listenablefuture-prebuilt-jar",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/media2/media2-exoplayer/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/media2/media2-exoplayer/1.3.0-alpha01/Android.bp
index ab989f4..6abd03f 100644
--- a/current/androidx/m2repository/androidx/media2/media2-exoplayer/1.3.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/media2/media2-exoplayer/1.3.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.media2_media2-exoplayer-nodeps",
+    name: "androidx.media2_media2-exoplayer",
     aars: ["media2-exoplayer-1.3.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -26,19 +26,3 @@
     static_libs: [
     ],
 }
-
-android_library {
-    name: "androidx.media2_media2-exoplayer",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.media2_media2-exoplayer-nodeps",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/media2/media2-player/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/media2/media2-player/1.3.0-alpha01/Android.bp
index 47afe5b..c781394 100644
--- a/current/androidx/m2repository/androidx/media2/media2-player/1.3.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/media2/media2-player/1.3.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.media2_media2-player-nodeps",
+    name: "androidx.media2_media2-player",
     aars: ["media2-player-1.3.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "guava-listenablefuture-prebuilt-jar",
     ],
 }
-
-android_library {
-    name: "androidx.media2_media2-player",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.media2_media2-player-nodeps",
-        "androidx.collection_collection",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.media2_media2-common",
-        "androidx.media2_media2-exoplayer",
-        "guava-listenablefuture-prebuilt-jar",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/media2/media2-session/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/media2/media2-session/1.3.0-alpha01/Android.bp
index 078e8f8..01cfd69 100644
--- a/current/androidx/m2repository/androidx/media2/media2-session/1.3.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/media2/media2-session/1.3.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.media2_media2-session-nodeps",
+    name: "androidx.media2_media2-session",
     aars: ["media2-session-1.3.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "guava-listenablefuture-prebuilt-jar",
     ],
 }
-
-android_library {
-    name: "androidx.media2_media2-session",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.media2_media2-session-nodeps",
-        "androidx.collection_collection",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.media2_media2-common",
-        "guava-listenablefuture-prebuilt-jar",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/media2/media2-widget/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/media2/media2-widget/1.3.0-alpha01/Android.bp
index 0060bd0..6e89742 100644
--- a/current/androidx/m2repository/androidx/media2/media2-widget/1.3.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/media2/media2-widget/1.3.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.media2_media2-widget-nodeps",
+    name: "androidx.media2_media2-widget",
     aars: ["media2-widget-1.3.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "androidx.palette_palette",
     ],
 }
-
-android_library {
-    name: "androidx.media2_media2-widget",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.media2_media2-widget-nodeps",
-        "androidx.appcompat_appcompat",
-        "androidx.media2_media2-session",
-        "androidx.palette_palette",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/mediarouter/mediarouter/1.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/mediarouter/mediarouter/1.5.0-alpha01/Android.bp
index 7318da1..378d59e 100644
--- a/current/androidx/m2repository/androidx/mediarouter/mediarouter/1.5.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/mediarouter/mediarouter/1.5.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.mediarouter_mediarouter-nodeps",
+    name: "androidx.mediarouter_mediarouter",
     aars: ["mediarouter-1.5.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "guava-listenablefuture-prebuilt-jar",
     ],
 }
-
-android_library {
-    name: "androidx.mediarouter_mediarouter",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.mediarouter_mediarouter-nodeps",
-        "androidx.appcompat_appcompat",
-        "androidx.appcompat_appcompat-resources",
-        "androidx.core_core",
-        "androidx.media_media",
-        "androidx.palette_palette",
-        "androidx.recyclerview_recyclerview",
-        "guava-listenablefuture-prebuilt-jar",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/navigation/navigation-common-ktx/2.8.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-common-ktx/2.8.0-alpha07/Android.bp
index 64f7b63..b6a7cc9 100644
--- a/current/androidx/m2repository/androidx/navigation/navigation-common-ktx/2.8.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/navigation/navigation-common-ktx/2.8.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.navigation_navigation-common-ktx-nodeps",
+    name: "androidx.navigation_navigation-common-ktx",
     aars: ["navigation-common-ktx-2.8.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,18 +27,3 @@
         "androidx.navigation_navigation-common",
     ],
 }
-
-android_library {
-    name: "androidx.navigation_navigation-common-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.navigation_navigation-common-ktx-nodeps",
-        "androidx.navigation_navigation-common",
-    ],
-}
diff --git a/current/androidx/m2repository/androidx/navigation/navigation-common/2.8.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-common/2.8.0-alpha07/Android.bp
index 52a419e..486c9a9 100644
--- a/current/androidx/m2repository/androidx/navigation/navigation-common/2.8.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/navigation/navigation-common/2.8.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.navigation_navigation-common-nodeps",
+    name: "androidx.navigation_navigation-common",
     aars: ["navigation-common-2.8.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -37,28 +37,3 @@
         "kotlinx_serialization_core",
     ],
 }
-
-android_library {
-    name: "androidx.navigation_navigation-common",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.navigation_navigation-common-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection-ktx",
-        "androidx.core_core-ktx",
-        "androidx.lifecycle_lifecycle-common",
-        "androidx.lifecycle_lifecycle-runtime-ktx",
-        "androidx.lifecycle_lifecycle-viewmodel-ktx",
-        "androidx.lifecycle_lifecycle-viewmodel-savedstate",
-        "androidx.profileinstaller_profileinstaller",
-        "androidx.savedstate_savedstate-ktx",
-        "kotlin-stdlib",
-        "kotlinx_serialization_core",
-    ],
-}
diff --git a/current/androidx/m2repository/androidx/navigation/navigation-compose/2.8.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-compose/2.8.0-alpha07/Android.bp
index 2c95fec..accf463 100644
--- a/current/androidx/m2repository/androidx/navigation/navigation-compose/2.8.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/navigation/navigation-compose/2.8.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.navigation_navigation-compose-nodeps",
+    name: "androidx.navigation_navigation-compose",
     aars: ["navigation-compose-2.8.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -36,27 +36,3 @@
         "kotlinx_serialization_core",
     ],
 }
-
-android_library {
-    name: "androidx.navigation_navigation-compose",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.navigation_navigation-compose-nodeps",
-        "androidx.activity_activity-compose",
-        "androidx.compose.animation_animation",
-        "androidx.compose.foundation_foundation-layout",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.runtime_runtime-saveable",
-        "androidx.compose.ui_ui",
-        "androidx.lifecycle_lifecycle-viewmodel-compose",
-        "androidx.navigation_navigation-runtime-ktx",
-        "kotlin-stdlib",
-        "kotlinx_serialization_core",
-    ],
-}
diff --git a/current/androidx/m2repository/androidx/navigation/navigation-fragment-ktx/2.8.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-fragment-ktx/2.8.0-alpha07/Android.bp
index a78bb7b..b6ddeb4 100644
--- a/current/androidx/m2repository/androidx/navigation/navigation-fragment-ktx/2.8.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/navigation/navigation-fragment-ktx/2.8.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.navigation_navigation-fragment-ktx-nodeps",
+    name: "androidx.navigation_navigation-fragment-ktx",
     aars: ["navigation-fragment-ktx-2.8.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,19 +28,3 @@
         "androidx.navigation_navigation-runtime-ktx",
     ],
 }
-
-android_library {
-    name: "androidx.navigation_navigation-fragment-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.navigation_navigation-fragment-ktx-nodeps",
-        "androidx.navigation_navigation-fragment",
-        "androidx.navigation_navigation-runtime-ktx",
-    ],
-}
diff --git a/current/androidx/m2repository/androidx/navigation/navigation-fragment/2.8.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-fragment/2.8.0-alpha07/Android.bp
index 4fc72bd..8f50fdf 100644
--- a/current/androidx/m2repository/androidx/navigation/navigation-fragment/2.8.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/navigation/navigation-fragment/2.8.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.navigation_navigation-fragment-nodeps",
+    name: "androidx.navigation_navigation-fragment",
     aars: ["navigation-fragment-2.8.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,22 +31,3 @@
         "kotlinx_serialization_core",
     ],
 }
-
-android_library {
-    name: "androidx.navigation_navigation-fragment",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.navigation_navigation-fragment-nodeps",
-        "androidx.fragment_fragment-ktx",
-        "androidx.navigation_navigation-runtime",
-        "androidx.slidingpanelayout_slidingpanelayout",
-        "kotlin-stdlib",
-        "kotlinx_serialization_core",
-    ],
-}
diff --git a/current/androidx/m2repository/androidx/navigation/navigation-runtime-ktx/2.8.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-runtime-ktx/2.8.0-alpha07/Android.bp
index bb44d79..b718f7a 100644
--- a/current/androidx/m2repository/androidx/navigation/navigation-runtime-ktx/2.8.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/navigation/navigation-runtime-ktx/2.8.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.navigation_navigation-runtime-ktx-nodeps",
+    name: "androidx.navigation_navigation-runtime-ktx",
     aars: ["navigation-runtime-ktx-2.8.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,19 +28,3 @@
         "androidx.navigation_navigation-runtime",
     ],
 }
-
-android_library {
-    name: "androidx.navigation_navigation-runtime-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.navigation_navigation-runtime-ktx-nodeps",
-        "androidx.navigation_navigation-common-ktx",
-        "androidx.navigation_navigation-runtime",
-    ],
-}
diff --git a/current/androidx/m2repository/androidx/navigation/navigation-runtime/2.8.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-runtime/2.8.0-alpha07/Android.bp
index c0c0c50..d9a7232 100644
--- a/current/androidx/m2repository/androidx/navigation/navigation-runtime/2.8.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/navigation/navigation-runtime/2.8.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.navigation_navigation-runtime-nodeps",
+    name: "androidx.navigation_navigation-runtime",
     aars: ["navigation-runtime-2.8.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,25 +34,3 @@
         "kotlinx_serialization_core",
     ],
 }
-
-android_library {
-    name: "androidx.navigation_navigation-runtime",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.navigation_navigation-runtime-nodeps",
-        "androidx.activity_activity-ktx",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.lifecycle_lifecycle-runtime-ktx",
-        "androidx.lifecycle_lifecycle-viewmodel-ktx",
-        "androidx.navigation_navigation-common",
-        "kotlin-stdlib",
-        "kotlinx_serialization_core",
-    ],
-}
diff --git a/current/androidx/m2repository/androidx/navigation/navigation-testing/2.8.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-testing/2.8.0-alpha07/Android.bp
index fdd505e..8e24003 100644
--- a/current/androidx/m2repository/androidx/navigation/navigation-testing/2.8.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/navigation/navigation-testing/2.8.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.navigation_navigation-testing-nodeps",
+    name: "androidx.navigation_navigation-testing",
     aars: ["navigation-testing-2.8.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,19 +28,3 @@
         "androidx.navigation_navigation-runtime",
     ],
 }
-
-android_library {
-    name: "androidx.navigation_navigation-testing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.navigation_navigation-testing-nodeps",
-        "androidx.lifecycle_lifecycle-runtime-testing",
-        "androidx.navigation_navigation-runtime",
-    ],
-}
diff --git a/current/androidx/m2repository/androidx/navigation/navigation-ui-ktx/2.8.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-ui-ktx/2.8.0-alpha07/Android.bp
index 6ed0980..ddd5ee2 100644
--- a/current/androidx/m2repository/androidx/navigation/navigation-ui-ktx/2.8.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/navigation/navigation-ui-ktx/2.8.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.navigation_navigation-ui-ktx-nodeps",
+    name: "androidx.navigation_navigation-ui-ktx",
     aars: ["navigation-ui-ktx-2.8.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,19 +28,3 @@
         "androidx.navigation_navigation-ui",
     ],
 }
-
-android_library {
-    name: "androidx.navigation_navigation-ui-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.navigation_navigation-ui-ktx-nodeps",
-        "androidx.navigation_navigation-runtime-ktx",
-        "androidx.navigation_navigation-ui",
-    ],
-}
diff --git a/current/androidx/m2repository/androidx/navigation/navigation-ui/2.8.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/navigation/navigation-ui/2.8.0-alpha07/Android.bp
index affd0f8..a8e725d 100644
--- a/current/androidx/m2repository/androidx/navigation/navigation-ui/2.8.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/navigation/navigation-ui/2.8.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.navigation_navigation-ui-nodeps",
+    name: "androidx.navigation_navigation-ui",
     aars: ["navigation-ui-2.8.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,23 +32,3 @@
         "com.google.android.material_material",
     ],
 }
-
-android_library {
-    name: "androidx.navigation_navigation-ui",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.navigation_navigation-ui-nodeps",
-        "androidx.annotation_annotation-experimental",
-        "androidx.customview_customview",
-        "androidx.drawerlayout_drawerlayout",
-        "androidx.navigation_navigation-runtime",
-        "androidx.transition_transition",
-        "com.google.android.material_material",
-    ],
-}
diff --git a/current/androidx/m2repository/androidx/paging/paging-common-android/3.3.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/paging/paging-common-android/3.3.0-alpha05/Android.bp
index f604870..5ffef02 100644
--- a/current/androidx/m2repository/androidx/paging/paging-common-android/3.3.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/paging/paging-common-android/3.3.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.paging_paging-common-nodeps",
+    name: "androidx.paging_paging-common",
     aars: ["paging-common-android-3.3.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.paging_paging-common",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.paging_paging-common-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.arch.core_core-common",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/paging/paging-common-ktx/3.3.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/paging/paging-common-ktx/3.3.0-alpha05/Android.bp
index db2290b..6b2dc5f 100644
--- a/current/androidx/m2repository/androidx/paging/paging-common-ktx/3.3.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/paging/paging-common-ktx/3.3.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.paging_paging-common-ktx-nodeps",
+    name: "androidx.paging_paging-common-ktx",
     jars: ["paging-common-ktx-3.3.0-alpha05.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,20 +23,7 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.paging_paging-common-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.paging_paging-common-ktx-nodeps",
         "androidx.paging_paging-common",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/paging/paging-compose-android/3.3.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/paging/paging-compose-android/3.3.0-alpha05/Android.bp
index 01bc9d1..2b0ce0b 100644
--- a/current/androidx/m2repository/androidx/paging/paging-compose-android/3.3.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/paging/paging-compose-android/3.3.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.paging_paging-compose-nodeps",
+    name: "androidx.paging_paging-compose",
     aars: ["paging-compose-android-3.3.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.paging_paging-compose",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.paging_paging-compose-nodeps",
-        "androidx.compose.foundation_foundation",
-        "androidx.compose.runtime_runtime",
-        "androidx.paging_paging-common",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/paging/paging-guava/3.3.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/paging/paging-guava/3.3.0-alpha05/Android.bp
index c750dd6..de08007 100644
--- a/current/androidx/m2repository/androidx/paging/paging-guava/3.3.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/paging/paging-guava/3.3.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.paging_paging-guava-nodeps",
+    name: "androidx.paging_paging-guava",
     aars: ["paging-guava-3.3.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlinx_coroutines_guava",
     ],
 }
-
-android_library {
-    name: "androidx.paging_paging-guava",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.paging_paging-guava-nodeps",
-        "androidx.paging_paging-common",
-        "guava",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_guava",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/paging/paging-runtime/3.3.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/paging/paging-runtime/3.3.0-alpha05/Android.bp
index e8daa61..6c26fa4 100644
--- a/current/androidx/m2repository/androidx/paging/paging-runtime/3.3.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/paging/paging-runtime/3.3.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.paging_paging-runtime-nodeps",
+    name: "androidx.paging_paging-runtime",
     aars: ["paging-runtime-3.3.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -35,28 +35,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.paging_paging-runtime",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.paging_paging-runtime-nodeps",
-        "androidx.core_core-ktx",
-        "androidx.lifecycle_lifecycle-livedata-ktx",
-        "androidx.lifecycle_lifecycle-runtime-ktx",
-        "androidx.lifecycle_lifecycle-viewmodel-ktx",
-        "androidx.paging_paging-common",
-        "androidx.paging_paging-common-ktx",
-        "androidx.recyclerview_recyclerview",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/palette/palette/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/palette/palette/1.1.0-alpha01/Android.bp
index 0f0f5bf..cd204f0 100644
--- a/current/androidx/m2repository/androidx/palette/palette/1.1.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/palette/palette/1.1.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.palette_palette-nodeps",
+    name: "androidx.palette_palette",
     aars: ["palette-1.1.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.palette_palette",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.palette_palette-nodeps",
-        "androidx.collection_collection",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/percentlayout/percentlayout/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/percentlayout/percentlayout/1.1.0-alpha01/Android.bp
index 8297340..7945e89 100644
--- a/current/androidx/m2repository/androidx/percentlayout/percentlayout/1.1.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/percentlayout/percentlayout/1.1.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.percentlayout_percentlayout-nodeps",
+    name: "androidx.percentlayout_percentlayout",
     aars: ["percentlayout-1.1.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.percentlayout_percentlayout",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.percentlayout_percentlayout-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/preference/preference/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/preference/preference/1.3.0-alpha01/Android.bp
index 8373a69..f2b5d69 100644
--- a/current/androidx/m2repository/androidx/preference/preference/1.3.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/preference/preference/1.3.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.preference_preference-nodeps",
+    name: "androidx.preference_preference",
     aars: ["preference-1.3.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "androidx.slidingpanelayout_slidingpanelayout",
     ],
 }
-
-android_library {
-    name: "androidx.preference_preference",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.preference_preference-nodeps",
-        "androidx.activity_activity-ktx",
-        "androidx.annotation_annotation",
-        "androidx.appcompat_appcompat",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.fragment_fragment-ktx",
-        "androidx.recyclerview_recyclerview",
-        "androidx.slidingpanelayout_slidingpanelayout",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/print/print/1.1.0-beta01/Android.bp b/current/androidx/m2repository/androidx/print/print/1.1.0-beta01/Android.bp
index 66da3d0..747a994 100644
--- a/current/androidx/m2repository/androidx/print/print/1.1.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/print/print/1.1.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.print_print-nodeps",
+    name: "androidx.print_print",
     aars: ["print-1.1.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,20 +27,3 @@
         "androidx.annotation_annotation",
     ],
 }
-
-android_library {
-    name: "androidx.print_print",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.print_print-nodeps",
-        "androidx.annotation_annotation",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices-java/1.1.0-beta05/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices-java/1.1.0-beta05/Android.bp
index f66efce..69a03a9 100644
--- a/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices-java/1.1.0-beta05/Android.bp
+++ b/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices-java/1.1.0-beta05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.privacysandbox.ads_ads-adservices-java-nodeps",
+    name: "androidx.privacysandbox.ads_ads-adservices-java",
     aars: ["ads-adservices-java-1.1.0-beta05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.privacysandbox.ads_ads-adservices-java",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.privacysandbox.ads_ads-adservices-java-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.core_core-ktx",
-        "androidx.privacysandbox.ads_ads-adservices",
-        "guava-listenablefuture-prebuilt-jar",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices/1.1.0-beta05/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices/1.1.0-beta05/Android.bp
index 6d844d5..08fdb8c 100644
--- a/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices/1.1.0-beta05/Android.bp
+++ b/current/androidx/m2repository/androidx/privacysandbox/ads/ads-adservices/1.1.0-beta05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.privacysandbox.ads_ads-adservices-nodeps",
+    name: "androidx.privacysandbox.ads_ads-adservices",
     aars: ["ads-adservices-1.1.0-beta05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.privacysandbox.ads_ads-adservices",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.privacysandbox.ads_ads-adservices-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core-ktx",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-client/1.0.0-alpha13/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-client/1.0.0-alpha13/Android.bp
index ea386d8..b139c3c 100644
--- a/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-client/1.0.0-alpha13/Android.bp
+++ b/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-client/1.0.0-alpha13/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.privacysandbox.sdkruntime_sdkruntime-client-nodeps",
+    name: "androidx.privacysandbox.sdkruntime_sdkruntime-client",
     aars: ["sdkruntime-client-1.0.0-alpha13.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.privacysandbox.sdkruntime_sdkruntime-client",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.privacysandbox.sdkruntime_sdkruntime-client-nodeps",
-        "androidx.activity_activity",
-        "androidx.core_core",
-        "androidx.core_core-ktx",
-        "androidx.privacysandbox.sdkruntime_sdkruntime-core",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-core/1.0.0-alpha13/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-core/1.0.0-alpha13/Android.bp
index c098f47..33376fd 100644
--- a/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-core/1.0.0-alpha13/Android.bp
+++ b/current/androidx/m2repository/androidx/privacysandbox/sdkruntime/sdkruntime-core/1.0.0-alpha13/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.privacysandbox.sdkruntime_sdkruntime-core-nodeps",
+    name: "androidx.privacysandbox.sdkruntime_sdkruntime-core",
     aars: ["sdkruntime-core-1.0.0-alpha13.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.privacysandbox.sdkruntime_sdkruntime-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.privacysandbox.sdkruntime_sdkruntime-core-nodeps",
-        "androidx.activity_activity",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.core_core-ktx",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apicompiler/1.0.0-alpha08/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apicompiler/1.0.0-alpha08/Android.bp
index 4f04cae..d47fb23 100644
--- a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apicompiler/1.0.0-alpha08/Android.bp
+++ b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apicompiler/1.0.0-alpha08/Android.bp
@@ -15,21 +15,13 @@
 }
 
 java_import_host {
-    name: "androidx.privacysandbox.tools_tools-apicompiler-nodeps",
-    jars: ["tools-apicompiler-1.0.0-alpha08.jar"],
-    sdk_version: "34",
-}
-
-java_library_host {
     name: "androidx.privacysandbox.tools_tools-apicompiler",
+    jars: ["tools-apicompiler-1.0.0-alpha08.jar"],
     static_libs: [
-        "androidx.privacysandbox.tools_tools-apicompiler-nodeps",
         "androidx.privacysandbox.tools_tools",
         "androidx.privacysandbox.tools_tools-core",
         "kotlin-stdlib",
         "kotlinpoet",
         "symbol-processing-api",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apigenerator/1.0.0-alpha08/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apigenerator/1.0.0-alpha08/Android.bp
index 6167686..7a798e2 100644
--- a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apigenerator/1.0.0-alpha08/Android.bp
+++ b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apigenerator/1.0.0-alpha08/Android.bp
@@ -15,15 +15,9 @@
 }
 
 java_import_host {
-    name: "androidx.privacysandbox.tools_tools-apigenerator-nodeps",
-    jars: ["tools-apigenerator-1.0.0-alpha08.jar"],
-    sdk_version: "34",
-}
-
-java_library_host {
     name: "androidx.privacysandbox.tools_tools-apigenerator",
+    jars: ["tools-apigenerator-1.0.0-alpha08.jar"],
     static_libs: [
-        "androidx.privacysandbox.tools_tools-apigenerator-nodeps",
         "androidx.privacysandbox.tools_tools",
         "androidx.privacysandbox.tools_tools-core",
         "kotlin-stdlib",
@@ -32,6 +26,4 @@
         "ow2-asm",
         "ow2-asm-commons",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apipackager/1.0.0-alpha08/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apipackager/1.0.0-alpha08/Android.bp
index 763b749..a4450b7 100644
--- a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apipackager/1.0.0-alpha08/Android.bp
+++ b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-apipackager/1.0.0-alpha08/Android.bp
@@ -15,15 +15,9 @@
 }
 
 java_import_host {
-    name: "androidx.privacysandbox.tools_tools-apipackager-nodeps",
-    jars: ["tools-apipackager-1.0.0-alpha08.jar"],
-    sdk_version: "34",
-}
-
-java_library_host {
     name: "androidx.privacysandbox.tools_tools-apipackager",
+    jars: ["tools-apipackager-1.0.0-alpha08.jar"],
     static_libs: [
-        "androidx.privacysandbox.tools_tools-apipackager-nodeps",
         "androidx.privacysandbox.tools_tools",
         "androidx.privacysandbox.tools_tools-core",
         "kotlin-stdlib",
@@ -31,6 +25,4 @@
         "ow2-asm",
         "ow2-asm-commons",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-core/1.0.0-alpha08/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-core/1.0.0-alpha08/Android.bp
index 136e61b..fa6b65f 100644
--- a/current/androidx/m2repository/androidx/privacysandbox/tools/tools-core/1.0.0-alpha08/Android.bp
+++ b/current/androidx/m2repository/androidx/privacysandbox/tools/tools-core/1.0.0-alpha08/Android.bp
@@ -15,21 +15,13 @@
 }
 
 java_import_host {
-    name: "androidx.privacysandbox.tools_tools-core-nodeps",
-    jars: ["tools-core-1.0.0-alpha08.jar"],
-    sdk_version: "34",
-}
-
-java_library_host {
     name: "androidx.privacysandbox.tools_tools-core",
+    jars: ["tools-core-1.0.0-alpha08.jar"],
     static_libs: [
-        "androidx.privacysandbox.tools_tools-core-nodeps",
         "androidx.privacysandbox.tools_tools",
         "guava",
         "kotlin-stdlib",
         "kotlinpoet",
         "libprotobuf-java-full",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/privacysandbox/tools/tools/1.0.0-alpha08/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/tools/tools/1.0.0-alpha08/Android.bp
index ee43089..3c0a90f 100644
--- a/current/androidx/m2repository/androidx/privacysandbox/tools/tools/1.0.0-alpha08/Android.bp
+++ b/current/androidx/m2repository/androidx/privacysandbox/tools/tools/1.0.0-alpha08/Android.bp
@@ -15,18 +15,10 @@
 }
 
 java_import_host {
-    name: "androidx.privacysandbox.tools_tools-nodeps",
-    jars: ["tools-1.0.0-alpha08.jar"],
-    sdk_version: "34",
-}
-
-java_library_host {
     name: "androidx.privacysandbox.tools_tools",
+    jars: ["tools-1.0.0-alpha08.jar"],
     static_libs: [
-        "androidx.privacysandbox.tools_tools-nodeps",
         "androidx.annotation_annotation",
         "kotlin-stdlib",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/privacysandbox/ui/ui-client/1.0.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/ui/ui-client/1.0.0-alpha07/Android.bp
index 9c5e3dc..2693875 100644
--- a/current/androidx/m2repository/androidx/privacysandbox/ui/ui-client/1.0.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/privacysandbox/ui/ui-client/1.0.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.privacysandbox.ui_ui-client-nodeps",
+    name: "androidx.privacysandbox.ui_ui-client",
     aars: ["ui-client-1.0.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.privacysandbox.ui_ui-client",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.privacysandbox.ui_ui-client-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.customview_customview-poolingcontainer",
-        "androidx.lifecycle_lifecycle-common",
-        "androidx.privacysandbox.sdkruntime_sdkruntime-client",
-        "androidx.privacysandbox.ui_ui-core",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/privacysandbox/ui/ui-core/1.0.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/ui/ui-core/1.0.0-alpha07/Android.bp
index 6043f8b..895edb9 100644
--- a/current/androidx/m2repository/androidx/privacysandbox/ui/ui-core/1.0.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/privacysandbox/ui/ui-core/1.0.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.privacysandbox.ui_ui-core-nodeps",
+    name: "androidx.privacysandbox.ui_ui-core",
     aars: ["ui-core-1.0.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.privacysandbox.ui_ui-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.privacysandbox.ui_ui-core-nodeps",
-        "androidx.annotation_annotation",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/privacysandbox/ui/ui-provider/1.0.0-alpha07/Android.bp b/current/androidx/m2repository/androidx/privacysandbox/ui/ui-provider/1.0.0-alpha07/Android.bp
index af7a0cb..baf8e3e 100644
--- a/current/androidx/m2repository/androidx/privacysandbox/ui/ui-provider/1.0.0-alpha07/Android.bp
+++ b/current/androidx/m2repository/androidx/privacysandbox/ui/ui-provider/1.0.0-alpha07/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.privacysandbox.ui_ui-provider-nodeps",
+    name: "androidx.privacysandbox.ui_ui-provider",
     aars: ["ui-provider-1.0.0-alpha07.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.privacysandbox.ui_ui-provider",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.privacysandbox.ui_ui-provider-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.privacysandbox.ui_ui-core",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/profileinstaller/profileinstaller/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/profileinstaller/profileinstaller/1.4.0-alpha01/Android.bp
index 1c62365..325d761 100644
--- a/current/androidx/m2repository/androidx/profileinstaller/profileinstaller/1.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/profileinstaller/profileinstaller/1.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.profileinstaller_profileinstaller-nodeps",
+    name: "androidx.profileinstaller_profileinstaller",
     aars: ["profileinstaller-1.4.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "guava-listenablefuture-prebuilt-jar",
     ],
 }
-
-android_library {
-    name: "androidx.profileinstaller_profileinstaller",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.profileinstaller_profileinstaller-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.startup_startup-runtime",
-        "guava-listenablefuture-prebuilt-jar",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/recommendation/recommendation/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/recommendation/recommendation/1.1.0-alpha01/Android.bp
index 9371936..9c27369 100644
--- a/current/androidx/m2repository/androidx/recommendation/recommendation/1.1.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/recommendation/recommendation/1.1.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.recommendation_recommendation-nodeps",
+    name: "androidx.recommendation_recommendation",
     aars: ["recommendation-1.1.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,20 +27,3 @@
         "androidx.annotation_annotation",
     ],
 }
-
-android_library {
-    name: "androidx.recommendation_recommendation",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.recommendation_recommendation-nodeps",
-        "androidx.annotation_annotation",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/recyclerview/recyclerview-selection/1.2.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/recyclerview/recyclerview-selection/1.2.0-alpha02/Android.bp
index 4d9f944..48ac085 100644
--- a/current/androidx/m2repository/androidx/recyclerview/recyclerview-selection/1.2.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/recyclerview/recyclerview-selection/1.2.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.recyclerview_recyclerview-selection-nodeps",
+    name: "androidx.recyclerview_recyclerview-selection",
     aars: ["recyclerview-selection-1.2.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "androidx.recyclerview_recyclerview",
     ],
 }
-
-android_library {
-    name: "androidx.recyclerview_recyclerview-selection",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.recyclerview_recyclerview-selection-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.recyclerview_recyclerview",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/recyclerview/recyclerview/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/recyclerview/recyclerview/1.4.0-alpha01/Android.bp
index a337fbc..c51b6af 100644
--- a/current/androidx/m2repository/androidx/recyclerview/recyclerview/1.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/recyclerview/recyclerview/1.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.recyclerview_recyclerview-nodeps",
+    name: "androidx.recyclerview_recyclerview",
     aars: ["recyclerview-1.4.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "androidx.profileinstaller_profileinstaller",
     ],
 }
-
-android_library {
-    name: "androidx.recyclerview_recyclerview",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.recyclerview_recyclerview-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.customview_customview",
-        "androidx.customview_customview-poolingcontainer",
-        "androidx.profileinstaller_profileinstaller",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/remotecallback/remotecallback-processor/1.0.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/remotecallback/remotecallback-processor/1.0.0-alpha02/Android.bp
index 0b4c507..4290e79 100644
--- a/current/androidx/m2repository/androidx/remotecallback/remotecallback-processor/1.0.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/remotecallback/remotecallback-processor/1.0.0-alpha02/Android.bp
@@ -15,18 +15,10 @@
 }
 
 java_import_host {
-    name: "androidx.remotecallback_remotecallback-processor-nodeps",
-    jars: ["remotecallback-processor-1.0.0-alpha02.jar"],
-    sdk_version: "34",
-}
-
-java_library_host {
     name: "androidx.remotecallback_remotecallback-processor",
+    jars: ["remotecallback-processor-1.0.0-alpha02.jar"],
     static_libs: [
-        "androidx.remotecallback_remotecallback-processor-nodeps",
         "androidx.annotation_annotation",
         "javapoet",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/remotecallback/remotecallback/1.0.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/remotecallback/remotecallback/1.0.0-alpha02/Android.bp
index 61b7114..e94fdcf 100644
--- a/current/androidx/m2repository/androidx/remotecallback/remotecallback/1.0.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/remotecallback/remotecallback/1.0.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.remotecallback_remotecallback-nodeps",
+    name: "androidx.remotecallback_remotecallback",
     aars: ["remotecallback-1.0.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.collection_collection",
     ],
 }
-
-android_library {
-    name: "androidx.remotecallback_remotecallback",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.remotecallback_remotecallback-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/resourceinspection/resourceinspection-annotation/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/resourceinspection/resourceinspection-annotation/1.1.0-alpha01/Android.bp
index 8463830..5211b76 100644
--- a/current/androidx/m2repository/androidx/resourceinspection/resourceinspection-annotation/1.1.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/resourceinspection/resourceinspection-annotation/1.1.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.resourceinspection_resourceinspection-annotation-nodeps",
+    name: "androidx.resourceinspection_resourceinspection-annotation",
     jars: ["resourceinspection-annotation-1.1.0-alpha01.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,20 +23,7 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.resourceinspection_resourceinspection-annotation",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.resourceinspection_resourceinspection-annotation-nodeps",
         "androidx.annotation_annotation",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/room/room-common-jvm/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-common-jvm/2.7.0-alpha01/Android.bp
index eae6f51..61e6e8ea 100644
--- a/current/androidx/m2repository/androidx/room/room-common-jvm/2.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/room/room-common-jvm/2.7.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.room_room-common-nodeps",
+    name: "androidx.room_room-common",
     jars: ["room-common-jvm-2.7.0-alpha01.jar"],
     sdk_version: "34",
     host_supported: true,
@@ -24,22 +24,8 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.room_room-common",
-    sdk_version: "34",
-    host_supported: true,
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.room_room-common-nodeps",
         "androidx.annotation_annotation",
         "kotlin-stdlib",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/room/room-compiler-processing/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-compiler-processing/2.7.0-alpha01/Android.bp
index 5036ac2..fcad370 100644
--- a/current/androidx/m2repository/androidx/room/room-compiler-processing/2.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/room/room-compiler-processing/2.7.0-alpha01/Android.bp
@@ -15,15 +15,9 @@
 }
 
 java_import_host {
-    name: "androidx.room_room-compiler-processing-nodeps",
-    jars: ["room-compiler-processing-2.7.0-alpha01.jar"],
-    sdk_version: "34",
-}
-
-java_library_host {
     name: "androidx.room_room-compiler-processing",
+    jars: ["room-compiler-processing-2.7.0-alpha01.jar"],
     static_libs: [
-        "androidx.room_room-compiler-processing-nodeps",
         "auto_common",
         "auto_value_annotations",
         "guava",
@@ -35,6 +29,4 @@
         "kotlinpoet-javapoet",
         "symbol-processing-api",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/room/room-compiler/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-compiler/2.7.0-alpha01/Android.bp
index 9bbe57d..33738d9 100644
--- a/current/androidx/m2repository/androidx/room/room-compiler/2.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/room/room-compiler/2.7.0-alpha01/Android.bp
@@ -15,15 +15,9 @@
 }
 
 java_import_host {
-    name: "androidx.room_room-compiler-nodeps",
-    jars: ["room-compiler-2.7.0-alpha01.jar"],
-    sdk_version: "34",
-}
-
-java_library_host {
     name: "androidx.room_room-compiler",
+    jars: ["room-compiler-2.7.0-alpha01.jar"],
     static_libs: [
-        "androidx.room_room-compiler-nodeps",
         "androidx.room_room-common",
         "androidx.room_room-compiler-processing",
         "androidx.room_room-migration",
@@ -39,6 +33,4 @@
         "symbol-processing-api",
         "xerial-sqlite-jdbc",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/room/room-guava/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-guava/2.7.0-alpha01/Android.bp
index 2607940..80fcb5a 100644
--- a/current/androidx/m2repository/androidx/room/room-guava/2.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/room/room-guava/2.7.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.room_room-guava-nodeps",
+    name: "androidx.room_room-guava",
     aars: ["room-guava-2.7.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "androidx.room_room-runtime",
     ],
 }
-
-android_library {
-    name: "androidx.room_room-guava",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.room_room-guava-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.arch.core_core-runtime",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.room_room-common",
-        "androidx.room_room-runtime",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/room/room-ktx/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-ktx/2.7.0-alpha01/Android.bp
index c8553d3..4e68d05 100644
--- a/current/androidx/m2repository/androidx/room/room-ktx/2.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/room/room-ktx/2.7.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.room_room-ktx-nodeps",
+    name: "androidx.room_room-ktx",
     aars: ["room-ktx-2.7.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.room_room-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.room_room-ktx-nodeps",
-        "androidx.room_room-common",
-        "androidx.room_room-runtime",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/room/room-migration/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-migration/2.7.0-alpha01/Android.bp
index ef5e42c..21d7431 100644
--- a/current/androidx/m2repository/androidx/room/room-migration/2.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/room/room-migration/2.7.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.room_room-migration-nodeps",
+    name: "androidx.room_room-migration",
     jars: ["room-migration-2.7.0-alpha01.jar"],
     sdk_version: "34",
     host_supported: true,
@@ -24,23 +24,9 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.room_room-migration",
-    sdk_version: "34",
-    host_supported: true,
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.room_room-migration-nodeps",
         "androidx.room_room-common",
         "gson",
         "kotlin-stdlib",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/room/room-paging-guava/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-paging-guava/2.7.0-alpha01/Android.bp
index f05c6ff..97c6393 100644
--- a/current/androidx/m2repository/androidx/room/room-paging-guava/2.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/room/room-paging-guava/2.7.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.room_room-paging-guava-nodeps",
+    name: "androidx.room_room-paging-guava",
     aars: ["room-paging-guava-2.7.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.room_room-paging-guava",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.room_room-paging-guava-nodeps",
-        "androidx.paging_paging-guava",
-        "androidx.room_room-guava",
-        "androidx.room_room-paging",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/room/room-paging/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-paging/2.7.0-alpha01/Android.bp
index d1e2677..7211552 100644
--- a/current/androidx/m2repository/androidx/room/room-paging/2.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/room/room-paging/2.7.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.room_room-paging-nodeps",
+    name: "androidx.room_room-paging",
     aars: ["room-paging-2.7.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.room_room-paging",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.room_room-paging-nodeps",
-        "androidx.paging_paging-common",
-        "androidx.room_room-ktx",
-        "androidx.room_room-runtime",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/room/room-runtime-android/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-runtime-android/2.7.0-alpha01/Android.bp
index d8e4e73..fff7da9 100644
--- a/current/androidx/m2repository/androidx/room/room-runtime-android/2.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/room/room-runtime-android/2.7.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.room_room-runtime-nodeps",
+    name: "androidx.room_room-runtime",
     aars: ["room-runtime-android-2.7.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -36,29 +36,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.room_room-runtime",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.room_room-runtime-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.arch.core_core-runtime",
-        "androidx.room_room-common",
-        "androidx.sqlite_sqlite",
-        "androidx.sqlite_sqlite-framework",
-        "kotlin-stdlib",
-        "kotlinx_atomicfu",
-        "kotlinx_coroutines",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/room/room-testing/2.7.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/room/room-testing/2.7.0-alpha01/Android.bp
index 4f9b5a8..2c1a072 100644
--- a/current/androidx/m2repository/androidx/room/room-testing/2.7.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/room/room-testing/2.7.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.room_room-testing-nodeps",
+    name: "androidx.room_room-testing",
     aars: ["room-testing-2.7.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "junit",
     ],
 }
-
-android_library {
-    name: "androidx.room_room-testing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.room_room-testing-nodeps",
-        "androidx.arch.core_core-runtime",
-        "androidx.room_room-common",
-        "androidx.room_room-migration",
-        "androidx.room_room-runtime",
-        "androidx.sqlite_sqlite",
-        "androidx.sqlite_sqlite-framework",
-        "junit",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/savedstate/savedstate-ktx/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/savedstate/savedstate-ktx/1.3.0-alpha01/Android.bp
index 0583fcc..9d77ca0 100644
--- a/current/androidx/m2repository/androidx/savedstate/savedstate-ktx/1.3.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/savedstate/savedstate-ktx/1.3.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.savedstate_savedstate-ktx-nodeps",
+    name: "androidx.savedstate_savedstate-ktx",
     aars: ["savedstate-ktx-1.3.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.savedstate_savedstate-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.savedstate_savedstate-ktx-nodeps",
-        "androidx.savedstate_savedstate",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/savedstate/savedstate/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/savedstate/savedstate/1.3.0-alpha01/Android.bp
index 58d9da9..7b7814c 100644
--- a/current/androidx/m2repository/androidx/savedstate/savedstate/1.3.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/savedstate/savedstate/1.3.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.savedstate_savedstate-nodeps",
+    name: "androidx.savedstate_savedstate",
     aars: ["savedstate-1.3.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.savedstate_savedstate",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.savedstate_savedstate-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.arch.core_core-common",
-        "androidx.lifecycle_lifecycle-common",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/slice/slice-builders/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/slice/slice-builders/1.1.0-alpha02/Android.bp
index 13417b9..ec53990 100644
--- a/current/androidx/m2repository/androidx/slice/slice-builders/1.1.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/slice/slice-builders/1.1.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.slice_slice-builders-nodeps",
+    name: "androidx.slice_slice-builders",
     aars: ["slice-builders-1.1.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "androidx.slice_slice-core",
     ],
 }
-
-android_library {
-    name: "androidx.slice_slice-builders",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.slice_slice-builders-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.remotecallback_remotecallback",
-        "androidx.slice_slice-core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/slice/slice-core/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/slice/slice-core/1.1.0-alpha02/Android.bp
index a4b81d7..589fe0d 100644
--- a/current/androidx/m2repository/androidx/slice/slice-core/1.1.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/slice/slice-core/1.1.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.slice_slice-core-nodeps",
+    name: "androidx.slice_slice-core",
     aars: ["slice-core-1.1.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "androidx.collection_collection",
     ],
 }
-
-android_library {
-    name: "androidx.slice_slice-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.slice_slice-core-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.appcompat_appcompat",
-        "androidx.collection_collection",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/slice/slice-view/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/slice/slice-view/1.1.0-alpha02/Android.bp
index a23ac79..b25789a 100644
--- a/current/androidx/m2repository/androidx/slice/slice-view/1.1.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/slice/slice-view/1.1.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.slice_slice-view-nodeps",
+    name: "androidx.slice_slice-view",
     aars: ["slice-view-1.1.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "androidx.slice_slice-core",
     ],
 }
-
-android_library {
-    name: "androidx.slice_slice-view",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.slice_slice-view-nodeps",
-        "androidx.appcompat_appcompat",
-        "androidx.collection_collection",
-        "androidx.lifecycle_lifecycle-livedata-core",
-        "androidx.recyclerview_recyclerview",
-        "androidx.slice_slice-core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/slidingpanelayout/slidingpanelayout/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/slidingpanelayout/slidingpanelayout/1.3.0-alpha01/Android.bp
index 5e3c985..460fd7a 100644
--- a/current/androidx/m2repository/androidx/slidingpanelayout/slidingpanelayout/1.3.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/slidingpanelayout/slidingpanelayout/1.3.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.slidingpanelayout_slidingpanelayout-nodeps",
+    name: "androidx.slidingpanelayout_slidingpanelayout",
     aars: ["slidingpanelayout-1.3.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "androidx.window_window",
     ],
 }
-
-android_library {
-    name: "androidx.slidingpanelayout_slidingpanelayout",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.slidingpanelayout_slidingpanelayout-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.customview_customview",
-        "androidx.transition_transition",
-        "androidx.window_window",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/sqlite/sqlite-android/2.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/sqlite/sqlite-android/2.5.0-alpha01/Android.bp
index c577719..09e0dbf 100644
--- a/current/androidx/m2repository/androidx/sqlite/sqlite-android/2.5.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/sqlite/sqlite-android/2.5.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.sqlite_sqlite-nodeps",
+    name: "androidx.sqlite_sqlite",
     aars: ["sqlite-android-2.5.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.sqlite_sqlite",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.sqlite_sqlite-nodeps",
-        "androidx.annotation_annotation",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/sqlite/sqlite-framework-android/2.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/sqlite/sqlite-framework-android/2.5.0-alpha01/Android.bp
index f7b17b8..4fa3378 100644
--- a/current/androidx/m2repository/androidx/sqlite/sqlite-framework-android/2.5.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/sqlite/sqlite-framework-android/2.5.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.sqlite_sqlite-framework-nodeps",
+    name: "androidx.sqlite_sqlite-framework",
     aars: ["sqlite-framework-android-2.5.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.sqlite_sqlite-framework",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.sqlite_sqlite-framework-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.sqlite_sqlite",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/startup/startup-runtime/1.2.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/startup/startup-runtime/1.2.0-alpha02/Android.bp
index e8aec9a..2471a0c 100644
--- a/current/androidx/m2repository/androidx/startup/startup-runtime/1.2.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/startup/startup-runtime/1.2.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.startup_startup-runtime-nodeps",
+    name: "androidx.startup_startup-runtime",
     aars: ["startup-runtime-1.2.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.tracing_tracing",
     ],
 }
-
-android_library {
-    name: "androidx.startup_startup-runtime",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.startup_startup-runtime-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.tracing_tracing",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/swiperefreshlayout/swiperefreshlayout/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/swiperefreshlayout/swiperefreshlayout/1.2.0-alpha01/Android.bp
index c26434f..00fc7e8 100644
--- a/current/androidx/m2repository/androidx/swiperefreshlayout/swiperefreshlayout/1.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/swiperefreshlayout/swiperefreshlayout/1.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.swiperefreshlayout_swiperefreshlayout-nodeps",
+    name: "androidx.swiperefreshlayout_swiperefreshlayout",
     aars: ["swiperefreshlayout-1.2.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "androidx.interpolator_interpolator",
     ],
 }
-
-android_library {
-    name: "androidx.swiperefreshlayout_swiperefreshlayout",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.swiperefreshlayout_swiperefreshlayout-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.interpolator_interpolator",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/test/uiautomator/uiautomator/2.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/test/uiautomator/uiautomator/2.4.0-alpha01/Android.bp
index c559de5..8419ed5 100644
--- a/current/androidx/m2repository/androidx/test/uiautomator/uiautomator/2.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/test/uiautomator/uiautomator/2.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.test.uiautomator_uiautomator-nodeps",
+    name: "androidx.test.uiautomator_uiautomator",
     aars: ["uiautomator-2.4.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "junit",
     ],
 }
-
-android_library {
-    name: "androidx.test.uiautomator_uiautomator",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.test.uiautomator_uiautomator-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.tracing_tracing",
-        "junit",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/textclassifier/textclassifier/1.0.0-alpha03/Android.bp b/current/androidx/m2repository/androidx/textclassifier/textclassifier/1.0.0-alpha03/Android.bp
index ff40b4b..8668a8a 100644
--- a/current/androidx/m2repository/androidx/textclassifier/textclassifier/1.0.0-alpha03/Android.bp
+++ b/current/androidx/m2repository/androidx/textclassifier/textclassifier/1.0.0-alpha03/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.textclassifier_textclassifier-nodeps",
+    name: "androidx.textclassifier_textclassifier",
     aars: ["textclassifier-1.0.0-alpha03.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.textclassifier_textclassifier",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.textclassifier_textclassifier-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.appcompat_appcompat",
-        "androidx.collection_collection",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/tracing/tracing-ktx/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/tracing/tracing-ktx/1.3.0-alpha02/Android.bp
index c98051d..1140e4f 100644
--- a/current/androidx/m2repository/androidx/tracing/tracing-ktx/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/tracing/tracing-ktx/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.tracing_tracing-ktx-nodeps",
+    name: "androidx.tracing_tracing-ktx",
     aars: ["tracing-ktx-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.tracing_tracing-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.tracing_tracing-ktx-nodeps",
-        "androidx.tracing_tracing",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/tracing/tracing-perfetto-binary/1.0.0/Android.bp b/current/androidx/m2repository/androidx/tracing/tracing-perfetto-binary/1.0.0/Android.bp
index eb03dc2..d8fb70a 100644
--- a/current/androidx/m2repository/androidx/tracing/tracing-perfetto-binary/1.0.0/Android.bp
+++ b/current/androidx/m2repository/androidx/tracing/tracing-perfetto-binary/1.0.0/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.tracing_tracing-perfetto-binary-nodeps",
+    name: "androidx.tracing_tracing-perfetto-binary",
     aars: ["tracing-perfetto-binary-1.0.0.aar"],
     sdk_version: "34",
     apex_available: [
@@ -26,19 +26,3 @@
     static_libs: [
     ],
 }
-
-android_library {
-    name: "androidx.tracing_tracing-perfetto-binary",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.tracing_tracing-perfetto-binary-nodeps",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/tracing/tracing-perfetto-handshake/1.0.0/Android.bp b/current/androidx/m2repository/androidx/tracing/tracing-perfetto-handshake/1.0.0/Android.bp
index 559f19e..2876e59 100644
--- a/current/androidx/m2repository/androidx/tracing/tracing-perfetto-handshake/1.0.0/Android.bp
+++ b/current/androidx/m2repository/androidx/tracing/tracing-perfetto-handshake/1.0.0/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.tracing_tracing-perfetto-handshake-nodeps",
+    name: "androidx.tracing_tracing-perfetto-handshake",
     jars: ["tracing-perfetto-handshake-1.0.0.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,20 +23,7 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.tracing_tracing-perfetto-handshake",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.tracing_tracing-perfetto-handshake-nodeps",
         "androidx.annotation_annotation",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/tracing/tracing-perfetto/1.0.0/Android.bp b/current/androidx/m2repository/androidx/tracing/tracing-perfetto/1.0.0/Android.bp
index 6296516..2bf5def 100644
--- a/current/androidx/m2repository/androidx/tracing/tracing-perfetto/1.0.0/Android.bp
+++ b/current/androidx/m2repository/androidx/tracing/tracing-perfetto/1.0.0/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.tracing_tracing-perfetto-nodeps",
+    name: "androidx.tracing_tracing-perfetto",
     aars: ["tracing-perfetto-1.0.0.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.tracing_tracing-perfetto",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.tracing_tracing-perfetto-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.startup_startup-runtime",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/tracing/tracing/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/tracing/tracing/1.3.0-alpha02/Android.bp
index 07ac16d..ee1bb96 100644
--- a/current/androidx/m2repository/androidx/tracing/tracing/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/tracing/tracing/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.tracing_tracing-nodeps",
+    name: "androidx.tracing_tracing",
     aars: ["tracing-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,20 +27,3 @@
         "androidx.annotation_annotation",
     ],
 }
-
-android_library {
-    name: "androidx.tracing_tracing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.tracing_tracing-nodeps",
-        "androidx.annotation_annotation",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/transition/transition-ktx/1.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/transition/transition-ktx/1.5.0-alpha01/Android.bp
index d91b69f..8d66274 100644
--- a/current/androidx/m2repository/androidx/transition/transition-ktx/1.5.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/transition/transition-ktx/1.5.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.transition_transition-ktx-nodeps",
+    name: "androidx.transition_transition-ktx",
     aars: ["transition-ktx-1.5.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.transition_transition-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.transition_transition-ktx-nodeps",
-        "androidx.transition_transition",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/transition/transition/1.5.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/transition/transition/1.5.0-alpha01/Android.bp
index ce0d0e5..e0d3a4f 100644
--- a/current/androidx/m2repository/androidx/transition/transition/1.5.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/transition/transition/1.5.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.transition_transition-nodeps",
+    name: "androidx.transition_transition",
     aars: ["transition-1.5.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.transition_transition",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.transition_transition-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/tvprovider/tvprovider/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/tvprovider/tvprovider/1.1.0-alpha02/Android.bp
index 4c85761..9ff01d8 100644
--- a/current/androidx/m2repository/androidx/tvprovider/tvprovider/1.1.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/tvprovider/tvprovider/1.1.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.tvprovider_tvprovider-nodeps",
+    name: "androidx.tvprovider_tvprovider",
     aars: ["tvprovider-1.1.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.tvprovider_tvprovider",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "21",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.tvprovider_tvprovider-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/vectordrawable/vectordrawable-animated/1.2.0-beta01/Android.bp b/current/androidx/m2repository/androidx/vectordrawable/vectordrawable-animated/1.2.0-beta01/Android.bp
index 6588dd0..b4df0e7 100644
--- a/current/androidx/m2repository/androidx/vectordrawable/vectordrawable-animated/1.2.0-beta01/Android.bp
+++ b/current/androidx/m2repository/androidx/vectordrawable/vectordrawable-animated/1.2.0-beta01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.vectordrawable_vectordrawable-animated-nodeps",
+    name: "androidx.vectordrawable_vectordrawable-animated",
     aars: ["vectordrawable-animated-1.2.0-beta01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "androidx.vectordrawable_vectordrawable",
     ],
 }
-
-android_library {
-    name: "androidx.vectordrawable_vectordrawable-animated",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.vectordrawable_vectordrawable-animated-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.interpolator_interpolator",
-        "androidx.vectordrawable_vectordrawable",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/vectordrawable/vectordrawable/1.2.0-beta02/Android.bp b/current/androidx/m2repository/androidx/vectordrawable/vectordrawable/1.2.0-beta02/Android.bp
index 3cf46a6..222881b 100644
--- a/current/androidx/m2repository/androidx/vectordrawable/vectordrawable/1.2.0-beta02/Android.bp
+++ b/current/androidx/m2repository/androidx/vectordrawable/vectordrawable/1.2.0-beta02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.vectordrawable_vectordrawable-nodeps",
+    name: "androidx.vectordrawable_vectordrawable",
     aars: ["vectordrawable-1.2.0-beta02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.vectordrawable_vectordrawable",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.vectordrawable_vectordrawable-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/versionedparcelable/versionedparcelable/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/versionedparcelable/versionedparcelable/1.2.0-alpha01/Android.bp
index a953cea..8239d51 100644
--- a/current/androidx/m2repository/androidx/versionedparcelable/versionedparcelable/1.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/versionedparcelable/versionedparcelable/1.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.versionedparcelable_versionedparcelable-nodeps",
+    name: "androidx.versionedparcelable_versionedparcelable",
     aars: ["versionedparcelable-1.2.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.collection_collection",
     ],
 }
-
-android_library {
-    name: "androidx.versionedparcelable_versionedparcelable",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.versionedparcelable_versionedparcelable-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/viewpager/viewpager/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/viewpager/viewpager/1.1.0-alpha02/Android.bp
index 82ee571..c44a28b 100644
--- a/current/androidx/m2repository/androidx/viewpager/viewpager/1.1.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/viewpager/viewpager/1.1.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.viewpager_viewpager-nodeps",
+    name: "androidx.viewpager_viewpager",
     aars: ["viewpager-1.1.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "androidx.customview_customview",
     ],
 }
-
-android_library {
-    name: "androidx.viewpager_viewpager",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.viewpager_viewpager-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.customview_customview",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/viewpager2/viewpager2/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/viewpager2/viewpager2/1.2.0-alpha01/Android.bp
index b4a1961..d980d0a 100644
--- a/current/androidx/m2repository/androidx/viewpager2/viewpager2/1.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/viewpager2/viewpager2/1.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.viewpager2_viewpager2-nodeps",
+    name: "androidx.viewpager2_viewpager2",
     aars: ["viewpager2-1.2.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "androidx.recyclerview_recyclerview",
     ],
 }
-
-android_library {
-    name: "androidx.viewpager2_viewpager2",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.viewpager2_viewpager2-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.fragment_fragment",
-        "androidx.recyclerview_recyclerview",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/compose/compose-foundation/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/wear/compose/compose-foundation/1.4.0-alpha05/Android.bp
index 9beda8b..c255ffd 100644
--- a/current/androidx/m2repository/androidx/wear/compose/compose-foundation/1.4.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/compose/compose-foundation/1.4.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.compose_compose-foundation-nodeps",
+    name: "androidx.wear.compose_compose-foundation",
     aars: ["compose-foundation-1.4.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -35,30 +35,7 @@
         "androidx.profileinstaller_profileinstaller",
         "kotlin-stdlib",
     ],
-}
-
-android_library {
-    name: "androidx.wear.compose_compose-foundation",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
+    optional_uses_libs: [
+        "wear-sdk",
     ],
-    min_sdk_version: "25",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.compose_compose-foundation-nodeps",
-        "androidx.compose.foundation_foundation",
-        "androidx.compose.foundation_foundation-layout",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-text",
-        "androidx.compose.ui_ui-util",
-        "androidx.core_core",
-        "androidx.lifecycle_lifecycle-runtime-compose",
-        "androidx.profileinstaller_profileinstaller",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/wear/compose/compose-material-core/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/wear/compose/compose-material-core/1.4.0-alpha05/Android.bp
index 8d5cce9..f7df259 100644
--- a/current/androidx/m2repository/androidx/wear/compose/compose-material-core/1.4.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/compose/compose-material-core/1.4.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.compose_compose-material-core-nodeps",
+    name: "androidx.wear.compose_compose-material-core",
     aars: ["compose-material-core-1.4.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -37,30 +37,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.wear.compose_compose-material-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "25",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.compose_compose-material-core-nodeps",
-        "androidx.compose.animation_animation",
-        "androidx.compose.foundation_foundation",
-        "androidx.compose.material_material-icons-core",
-        "androidx.compose.material_material-ripple",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-text",
-        "androidx.compose.ui_ui-util",
-        "androidx.profileinstaller_profileinstaller",
-        "androidx.wear.compose_compose-foundation",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/compose/compose-material/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/wear/compose/compose-material/1.4.0-alpha05/Android.bp
index ce4d702..a3dfd41 100644
--- a/current/androidx/m2repository/androidx/wear/compose/compose-material/1.4.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/compose/compose-material/1.4.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.compose_compose-material-nodeps",
+    name: "androidx.wear.compose_compose-material",
     aars: ["compose-material-1.4.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -39,32 +39,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.wear.compose_compose-material",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "25",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.compose_compose-material-nodeps",
-        "androidx.compose.animation_animation",
-        "androidx.compose.foundation_foundation",
-        "androidx.compose.material_material-icons-core",
-        "androidx.compose.material_material-ripple",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.compose.ui_ui-text",
-        "androidx.compose.ui_ui-util",
-        "androidx.lifecycle_lifecycle-common",
-        "androidx.profileinstaller_profileinstaller",
-        "androidx.wear.compose_compose-foundation",
-        "androidx.wear.compose_compose-material-core",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/compose/compose-navigation/1.4.0-alpha05/Android.bp b/current/androidx/m2repository/androidx/wear/compose/compose-navigation/1.4.0-alpha05/Android.bp
index 2d9ad20..2ee69a2 100644
--- a/current/androidx/m2repository/androidx/wear/compose/compose-navigation/1.4.0-alpha05/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/compose/compose-navigation/1.4.0-alpha05/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.compose_compose-navigation-nodeps",
+    name: "androidx.wear.compose_compose-navigation",
     aars: ["compose-navigation-1.4.0-alpha05.aar"],
     sdk_version: "34",
     apex_available: [
@@ -36,29 +36,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.wear.compose_compose-navigation",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "25",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.compose_compose-navigation-nodeps",
-        "androidx.activity_activity-compose",
-        "androidx.compose.runtime_runtime",
-        "androidx.compose.ui_ui",
-        "androidx.lifecycle_lifecycle-viewmodel-compose",
-        "androidx.navigation_navigation-common",
-        "androidx.navigation_navigation-compose",
-        "androidx.navigation_navigation-runtime",
-        "androidx.profileinstaller_profileinstaller",
-        "androidx.wear.compose_compose-material",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression-pipeline/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression-pipeline/1.2.0-alpha01/Android.bp
index f615243..99b2ff4 100644
--- a/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression-pipeline/1.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression-pipeline/1.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.protolayout_protolayout-expression-pipeline-nodeps",
+    name: "androidx.wear.protolayout_protolayout-expression-pipeline",
     aars: ["protolayout-expression-pipeline-1.2.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "androidx.wear.protolayout_protolayout-proto",
     ],
 }
-
-android_library {
-    name: "androidx.wear.protolayout_protolayout-expression-pipeline",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.protolayout_protolayout-expression-pipeline-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.core_core",
-        "androidx.wear.protolayout_protolayout-expression",
-        "androidx.wear.protolayout_protolayout-proto",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression/1.2.0-alpha01/Android.bp
index 0911c2b..0343b70 100644
--- a/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression/1.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/protolayout/protolayout-expression/1.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.protolayout_protolayout-expression-nodeps",
+    name: "androidx.wear.protolayout_protolayout-expression",
     aars: ["protolayout-expression-1.2.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "androidx.wear.protolayout_protolayout-proto",
     ],
 }
-
-android_library {
-    name: "androidx.wear.protolayout_protolayout-expression",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.protolayout_protolayout-expression-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.wear.protolayout_protolayout-proto",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/protolayout/protolayout-proto/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/protolayout/protolayout-proto/1.2.0-alpha01/Android.bp
index 302ebd6..ee877ed 100644
--- a/current/androidx/m2repository/androidx/wear/protolayout/protolayout-proto/1.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/protolayout/protolayout-proto/1.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.wear.protolayout_protolayout-proto-nodeps",
+    name: "androidx.wear.protolayout_protolayout-proto",
     jars: ["protolayout-proto-1.2.0-alpha01.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,20 +23,7 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.wear.protolayout_protolayout-proto",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.wear.protolayout_protolayout-proto-nodeps",
         "androidx.annotation_annotation",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/wear/protolayout/protolayout/1.2.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/protolayout/protolayout/1.2.0-alpha01/Android.bp
index afed171..62eb4a2 100644
--- a/current/androidx/m2repository/androidx/wear/protolayout/protolayout/1.2.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/protolayout/protolayout/1.2.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.protolayout_protolayout-nodeps",
+    name: "androidx.wear.protolayout_protolayout",
     aars: ["protolayout-1.2.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "androidx.wear.protolayout_protolayout-proto",
     ],
 }
-
-android_library {
-    name: "androidx.wear.protolayout_protolayout",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.protolayout_protolayout-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.wear.protolayout_protolayout-expression",
-        "androidx.wear.protolayout_protolayout-proto",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/tiles/tiles-proto/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/tiles/tiles-proto/1.4.0-alpha01/Android.bp
index 8a5219b..c45dda8 100644
--- a/current/androidx/m2repository/androidx/wear/tiles/tiles-proto/1.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/tiles/tiles-proto/1.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 java_import {
-    name: "androidx.wear.tiles_tiles-proto-nodeps",
+    name: "androidx.wear.tiles_tiles-proto",
     jars: ["tiles-proto-1.4.0-alpha01.jar"],
     sdk_version: "34",
     apex_available: [
@@ -23,21 +23,8 @@
         "//apex_available:anyapex",
     ],
     min_sdk_version: "24",
-}
-
-java_library_static {
-    name: "androidx.wear.tiles_tiles-proto",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "24",
     static_libs: [
-        "androidx.wear.tiles_tiles-proto-nodeps",
         "androidx.annotation_annotation",
         "androidx.wear.protolayout_protolayout-proto",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/wear/tiles/tiles/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/tiles/tiles/1.4.0-alpha01/Android.bp
index 57af8c6..8d885b7 100644
--- a/current/androidx/m2repository/androidx/wear/tiles/tiles/1.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/tiles/tiles/1.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.tiles_tiles-nodeps",
+    name: "androidx.wear.tiles_tiles",
     aars: ["tiles-1.4.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "guava-listenablefuture-prebuilt-jar",
     ],
 }
-
-android_library {
-    name: "androidx.wear.tiles_tiles",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.tiles_tiles-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.annotation_annotation-experimental",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.wear.protolayout_protolayout",
-        "androidx.wear.protolayout_protolayout-expression",
-        "androidx.wear.tiles_tiles-proto",
-        "guava-listenablefuture-prebuilt-jar",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-client-guava/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-client-guava/1.3.0-alpha02/Android.bp
index 63a11b9..3601bc5 100644
--- a/current/androidx/m2repository/androidx/wear/watchface/watchface-client-guava/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-client-guava/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.watchface_watchface-client-guava-nodeps",
+    name: "androidx.wear.watchface_watchface-client-guava",
     aars: ["watchface-client-guava-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlinx_coroutines_guava",
     ],
 }
-
-android_library {
-    name: "androidx.wear.watchface_watchface-client-guava",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.watchface_watchface-client-guava-nodeps",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.wear.watchface_watchface-client",
-        "kotlinx_coroutines_guava",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-client/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-client/1.3.0-alpha02/Android.bp
index 9f08a87..e6d4275 100644
--- a/current/androidx/m2repository/androidx/wear/watchface/watchface-client/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-client/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.watchface_watchface-client-nodeps",
+    name: "androidx.wear.watchface_watchface-client",
     aars: ["watchface-client-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -33,26 +33,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.wear.watchface_watchface-client",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.watchface_watchface-client-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.wear.watchface_watchface",
-        "androidx.wear.watchface_watchface-complications-data",
-        "androidx.wear.watchface_watchface-data",
-        "androidx.wear.watchface_watchface-style",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data-source/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data-source/1.3.0-alpha02/Android.bp
index b098063..80fffbe 100644
--- a/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data-source/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data-source/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.watchface_watchface-complications-data-source-nodeps",
+    name: "androidx.wear.watchface_watchface-complications-data-source",
     aars: ["watchface-complications-data-source-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "androidx.wear.watchface_watchface-complications-data",
     ],
 }
-
-android_library {
-    name: "androidx.wear.watchface_watchface-complications-data-source",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.watchface_watchface-complications-data-source-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.preference_preference",
-        "androidx.wear.watchface_watchface-complications",
-        "androidx.wear.watchface_watchface-complications-data",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data/1.3.0-alpha02/Android.bp
index 5c7cb4e..f4c50e2 100644
--- a/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-complications-data/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.watchface_watchface-complications-data-nodeps",
+    name: "androidx.wear.watchface_watchface-complications-data",
     aars: ["watchface-complications-data-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.wear.watchface_watchface-complications-data",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.watchface_watchface-complications-data-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.preference_preference",
-        "androidx.versionedparcelable_versionedparcelable",
-        "androidx.wear.protolayout_protolayout-expression",
-        "androidx.wear.protolayout_protolayout-expression-pipeline",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-complications/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-complications/1.3.0-alpha02/Android.bp
index 797fd3e..d76b814 100644
--- a/current/androidx/m2repository/androidx/wear/watchface/watchface-complications/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-complications/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.watchface_watchface-complications-nodeps",
+    name: "androidx.wear.watchface_watchface-complications",
     aars: ["watchface-complications-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.wear.watchface_watchface-complications",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.watchface_watchface-complications-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.wear.watchface_watchface-complications-data",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-data/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-data/1.3.0-alpha02/Android.bp
index ce342f8..1f17dcb 100644
--- a/current/androidx/m2repository/androidx/wear/watchface/watchface-data/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-data/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.watchface_watchface-data-nodeps",
+    name: "androidx.wear.watchface_watchface-data",
     aars: ["watchface-data-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.wear.watchface_watchface-data",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.watchface_watchface-data-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.versionedparcelable_versionedparcelable",
-        "androidx.wear.watchface_watchface-complications-data",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-editor-guava/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-editor-guava/1.3.0-alpha02/Android.bp
index 56bce93..b4f7b56 100644
--- a/current/androidx/m2repository/androidx/wear/watchface/watchface-editor-guava/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-editor-guava/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.watchface_watchface-editor-guava-nodeps",
+    name: "androidx.wear.watchface_watchface-editor-guava",
     aars: ["watchface-editor-guava-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -29,22 +29,3 @@
         "kotlinx_coroutines_guava",
     ],
 }
-
-android_library {
-    name: "androidx.wear.watchface_watchface-editor-guava",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.watchface_watchface-editor-guava-nodeps",
-        "androidx.concurrent_concurrent-futures",
-        "androidx.wear.watchface_watchface-editor",
-        "kotlinx_coroutines_guava",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-editor/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-editor/1.3.0-alpha02/Android.bp
index eb860c0..814da9e 100644
--- a/current/androidx/m2repository/androidx/wear/watchface/watchface-editor/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-editor/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.watchface_watchface-editor-nodeps",
+    name: "androidx.wear.watchface_watchface-editor",
     aars: ["watchface-editor-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -36,29 +36,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.wear.watchface_watchface-editor",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.watchface_watchface-editor-nodeps",
-        "androidx.activity_activity",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.lifecycle_lifecycle-common-java8",
-        "androidx.lifecycle_lifecycle-runtime-ktx",
-        "androidx.versionedparcelable_versionedparcelable",
-        "androidx.wear.watchface_watchface-client",
-        "androidx.wear.watchface_watchface-data",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-guava/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-guava/1.3.0-alpha02/Android.bp
index e451d78..5c733ed 100644
--- a/current/androidx/m2repository/androidx/wear/watchface/watchface-guava/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-guava/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.watchface_watchface-guava-nodeps",
+    name: "androidx.wear.watchface_watchface-guava",
     aars: ["watchface-guava-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "guava",
     ],
 }
-
-android_library {
-    name: "androidx.wear.watchface_watchface-guava",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.watchface_watchface-guava-nodeps",
-        "androidx.wear.watchface_watchface",
-        "guava",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface-style/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface-style/1.3.0-alpha02/Android.bp
index 99f0516..04e6c4d 100644
--- a/current/androidx/m2repository/androidx/wear/watchface/watchface-style/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/watchface/watchface-style/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.watchface_watchface-style-nodeps",
+    name: "androidx.wear.watchface_watchface-style",
     aars: ["watchface-style-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -32,25 +32,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.wear.watchface_watchface-style",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.watchface_watchface-style-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.preference_preference",
-        "androidx.wear.watchface_watchface-complications",
-        "androidx.wear.watchface_watchface-data",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/watchface/watchface/1.3.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/watchface/watchface/1.3.0-alpha02/Android.bp
index 61f6abe..0778c8f 100644
--- a/current/androidx/m2repository/androidx/wear/watchface/watchface/1.3.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/watchface/watchface/1.3.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear.watchface_watchface-nodeps",
+    name: "androidx.wear.watchface_watchface",
     aars: ["watchface-1.3.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -34,27 +34,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.wear.watchface_watchface",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "26",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear.watchface_watchface-nodeps",
-        "androidx.activity_activity",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.wear.watchface_watchface-complications-data",
-        "androidx.wear.watchface_watchface-data",
-        "androidx.wear.watchface_watchface-style",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/wear-ongoing/1.1.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/wear/wear-ongoing/1.1.0-alpha02/Android.bp
index 1e96760..1c4b347 100644
--- a/current/androidx/m2repository/androidx/wear/wear-ongoing/1.1.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/wear-ongoing/1.1.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear_wear-ongoing-nodeps",
+    name: "androidx.wear_wear-ongoing",
     aars: ["wear-ongoing-1.1.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "androidx.versionedparcelable_versionedparcelable",
     ],
 }
-
-android_library {
-    name: "androidx.wear_wear-ongoing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "25",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear_wear-ongoing-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.core_core-ktx",
-        "androidx.versionedparcelable_versionedparcelable",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/wear-phone-interactions/1.1.0-alpha04/Android.bp b/current/androidx/m2repository/androidx/wear/wear-phone-interactions/1.1.0-alpha04/Android.bp
index 81a5409..ead2314 100644
--- a/current/androidx/m2repository/androidx/wear/wear-phone-interactions/1.1.0-alpha04/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/wear-phone-interactions/1.1.0-alpha04/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear_wear-phone-interactions-nodeps",
+    name: "androidx.wear_wear-phone-interactions",
     aars: ["wear-phone-interactions-1.1.0-alpha04.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,24 +31,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.wear_wear-phone-interactions",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "25",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear_wear-phone-interactions-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.wear_wear",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/wear/wear/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/wear/wear/1.4.0-alpha01/Android.bp
index 73f8a8b..c62a760 100644
--- a/current/androidx/m2repository/androidx/wear/wear/1.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/wear/wear/1.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.wear_wear-nodeps",
+    name: "androidx.wear_wear",
     aars: ["wear-1.4.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -35,28 +35,3 @@
         "androidx.versionedparcelable_versionedparcelable",
     ],
 }
-
-android_library {
-    name: "androidx.wear_wear",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "23",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.wear_wear-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-        "androidx.core_core-ktx",
-        "androidx.dynamicanimation_dynamicanimation",
-        "androidx.fragment_fragment",
-        "androidx.lifecycle_lifecycle-runtime",
-        "androidx.recyclerview_recyclerview",
-        "androidx.swiperefreshlayout_swiperefreshlayout",
-        "androidx.versionedparcelable_versionedparcelable",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/webkit/webkit/1.7.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/webkit/webkit/1.7.0-alpha02/Android.bp
index a15ac53..515a52e 100644
--- a/current/androidx/m2repository/androidx/webkit/webkit/1.7.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/webkit/webkit/1.7.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.webkit_webkit-nodeps",
+    name: "androidx.webkit_webkit",
     aars: ["webkit-1.7.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "androidx.core_core",
     ],
 }
-
-android_library {
-    name: "androidx.webkit_webkit",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.webkit_webkit-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.core_core",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/window/extensions/core/core/1.1.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/window/extensions/core/core/1.1.0-alpha01/Android.bp
index 25d375b..a988ad5 100644
--- a/current/androidx/m2repository/androidx/window/extensions/core/core/1.1.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/window/extensions/core/core/1.1.0-alpha01/Android.bp
@@ -43,6 +43,4 @@
         "androidx.annotation_annotation",
         "kotlin-stdlib",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/window/extensions/extensions/1.3.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/window/extensions/extensions/1.3.0-alpha01/Android.bp
index bb464c8..a296f95 100644
--- a/current/androidx/m2repository/androidx/window/extensions/extensions/1.3.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/window/extensions/extensions/1.3.0-alpha01/Android.bp
@@ -45,6 +45,4 @@
         "androidx.annotation_annotation-experimental",
         "androidx.window.extensions.core_core",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/window/window-core-android/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/window/window-core-android/1.4.0-alpha01/Android.bp
index 1336056..598c793 100644
--- a/current/androidx/m2repository/androidx/window/window-core-android/1.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/window/window-core-android/1.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.window_window-core-nodeps",
+    name: "androidx.window_window-core",
     aars: ["window-core-android-1.4.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -28,21 +28,3 @@
         "kotlin-stdlib",
     ],
 }
-
-android_library {
-    name: "androidx.window_window-core",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.window_window-core-nodeps",
-        "androidx.annotation_annotation",
-        "kotlin-stdlib",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/window/window-java/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/window/window-java/1.4.0-alpha01/Android.bp
index 835a6d7..5324de9 100644
--- a/current/androidx/m2repository/androidx/window/window-java/1.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/window/window-java/1.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.window_window-java-nodeps",
+    name: "androidx.window_window-java",
     aars: ["window-java-1.4.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "kotlinx_coroutines",
     ],
 }
-
-android_library {
-    name: "androidx.window_window-java",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.window_window-java-nodeps",
-        "androidx.core_core",
-        "androidx.window_window",
-        "kotlin-stdlib",
-        "kotlinx_coroutines",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/window/window/1.4.0-alpha01/Android.bp b/current/androidx/m2repository/androidx/window/window/1.4.0-alpha01/Android.bp
index 45e52d5..de1efcf 100644
--- a/current/androidx/m2repository/androidx/window/window/1.4.0-alpha01/Android.bp
+++ b/current/androidx/m2repository/androidx/window/window/1.4.0-alpha01/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.window_window-nodeps",
+    name: "androidx.window_window",
     aars: ["window-1.4.0-alpha01.aar"],
     sdk_version: "34",
     apex_available: [
@@ -31,30 +31,8 @@
         "kotlin-stdlib",
         "kotlinx_coroutines_android",
     ],
-}
-
-android_library {
-    name: "androidx.window_window",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.window_window-nodeps",
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core",
-        "androidx.window.extensions.core_core",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
     optional_uses_libs: [
         "androidx.window.extensions",
         "androidx.window.sidecar",
     ],
-    java_version: "1.7",
 }
-
diff --git a/current/androidx/m2repository/androidx/work/work-runtime-ktx/2.10.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/work/work-runtime-ktx/2.10.0-alpha02/Android.bp
index de477dc..ca173bf 100644
--- a/current/androidx/m2repository/androidx/work/work-runtime-ktx/2.10.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/work/work-runtime-ktx/2.10.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.work_work-runtime-ktx-nodeps",
+    name: "androidx.work_work-runtime-ktx",
     aars: ["work-runtime-ktx-2.10.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -27,20 +27,3 @@
         "androidx.work_work-runtime",
     ],
 }
-
-android_library {
-    name: "androidx.work_work-runtime-ktx",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.work_work-runtime-ktx-nodeps",
-        "androidx.work_work-runtime",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/work/work-runtime/2.10.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/work/work-runtime/2.10.0-alpha02/Android.bp
index 9228b2d..12d51b5 100644
--- a/current/androidx/m2repository/androidx/work/work-runtime/2.10.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/work/work-runtime/2.10.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.work_work-runtime-nodeps",
+    name: "androidx.work_work-runtime",
     aars: ["work-runtime-2.10.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -37,30 +37,3 @@
         "kotlinx_coroutines_android",
     ],
 }
-
-android_library {
-    name: "androidx.work_work-runtime",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.work_work-runtime-nodeps",
-        "androidx.annotation_annotation-experimental",
-        "androidx.concurrent_concurrent-futures-ktx",
-        "androidx.core_core",
-        "androidx.lifecycle_lifecycle-livedata",
-        "androidx.lifecycle_lifecycle-service",
-        "androidx.room_room-ktx",
-        "androidx.startup_startup-runtime",
-        "androidx.tracing_tracing-ktx",
-        "guava-listenablefuture-prebuilt-jar",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
-    ],
-    java_version: "1.7",
-}
-
diff --git a/current/androidx/m2repository/androidx/work/work-testing/2.10.0-alpha02/Android.bp b/current/androidx/m2repository/androidx/work/work-testing/2.10.0-alpha02/Android.bp
index c7e0022..774d7a4 100644
--- a/current/androidx/m2repository/androidx/work/work-testing/2.10.0-alpha02/Android.bp
+++ b/current/androidx/m2repository/androidx/work/work-testing/2.10.0-alpha02/Android.bp
@@ -15,7 +15,7 @@
 }
 
 android_library_import {
-    name: "androidx.work_work-testing-nodeps",
+    name: "androidx.work_work-testing",
     aars: ["work-testing-2.10.0-alpha02.aar"],
     sdk_version: "34",
     apex_available: [
@@ -30,23 +30,3 @@
         "androidx.work_work-runtime",
     ],
 }
-
-android_library {
-    name: "androidx.work_work-testing",
-    sdk_version: "34",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    min_sdk_version: "19",
-    manifest: "manifest/AndroidManifest.xml",
-    static_libs: [
-        "androidx.work_work-testing-nodeps",
-        "androidx.concurrent_concurrent-futures-ktx",
-        "androidx.lifecycle_lifecycle-livedata-core",
-        "androidx.room_room-runtime",
-        "androidx.work_work-runtime",
-    ],
-    java_version: "1.7",
-}
-