diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index bbd0017..0b0ad9e 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -9855,8 +9855,9 @@
     libs: [
         "android-support-multidex",
         "androidx.annotation_annotation",
+        "androidx.annotation_annotation-experimental-nodeps",
         "androidx.collection_collection",
-        "androidx.core_core",
+        "androidx.core_core-nodeps",
         "framework-connectivity-t.stubs.module_lib",
         "framework-connectivity.stubs.module_lib",
         "framework-mediaprovider.stubs.module_lib",
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index b5d47d7..46918c6 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -1340,8 +1340,9 @@
   module.libs = {
     "androidx.annotation_annotation",
     "jsr305",
-    "androidx.core_core",
+    "androidx.core_core-nodeps",
     "androidx.collection_collection",
+    "androidx.annotation_annotation-experimental-nodeps",
     "android-support-multidex",
     "framework-connectivity.stubs.module_lib",
     "framework-connectivity-t.stubs.module_lib",