diff --git a/current/Android.bp b/current/Android.bp
index 3f01a09..fc99b11 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -6,14 +6,6 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-soong_config_module_type_import {
-    from: "packages/modules/common/Android.bp",
-    module_types: [
-        "module_java_sdk_library_import",
-        "module_prebuilt_bootclasspath_fragment",
-    ],
-}
-
 prebuilt_bootclasspath_fragment {
     name: "scheduling-sdk_com.android.scheduling-bootclasspath-fragment@current",
     sdk_member_name: "com.android.scheduling-bootclasspath-fragment",
@@ -30,14 +22,9 @@
     },
 }
 
-module_prebuilt_bootclasspath_fragment {
+prebuilt_bootclasspath_fragment {
     name: "com.android.scheduling-bootclasspath-fragment",
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
+    prefer: false,
     visibility: ["//visibility:public"],
     apex_available: ["com.android.scheduling"],
     licenses: ["scheduling-sdk_Android-Apache-2.0"],
@@ -81,14 +68,9 @@
     },
 }
 
-module_java_sdk_library_import {
+java_sdk_library_import {
     name: "framework-scheduling",
-    prefer: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
+    prefer: false,
     visibility: ["//visibility:public"],
     apex_available: ["com.android.scheduling"],
     licenses: ["scheduling-sdk_Android-Apache-2.0"],