diff --git a/libwvdrmengine/apex/prebuilt/Android.bp b/libwvdrmengine/apex/prebuilt/Android.bp
index 0d08810e..140647b7 100644
--- a/libwvdrmengine/apex/prebuilt/Android.bp
+++ b/libwvdrmengine/apex/prebuilt/Android.bp
@@ -24,62 +24,36 @@ package {
     default_applicable_licenses: ["vendor_widevine_license"],
 }
 
-soong_config_module_type_import {
-    from: "packages/modules/common/Android.bp",
-    module_types: ["module_apex_set"],
-}
-
-module_apex_set {
+apex_set {
     name: "com.google.android.widevine.nonupdatable",
     apex_name: "com.google.android.widevine",
     owner: "google",
     set: "com.google.android.widevine.nonupdatable.apks",
-    prefer: true,
+    vendor: true,
     // TODO(b/251299786): the prerelease field should be removed once
     // new api version is released, e.g. U(34).
     // This is a mitigation for apex extractor matching target sdk version
     // with current prerelease version.
     prerelease: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "widevine_module",
+        var_name: "source_build",
     },
 }
 
-module_apex_set {
+apex_set {
     name: "com.google.android.widevine.lazy",
     apex_name: "com.google.android.widevine.lazy",
     owner: "google",
     set: "com.google.android.widevine.lazy.apks",
-    prefer: true,
+    vendor: true,
     // TODO(b/251299786): the prerelease field should be removed once
     // new api version is released, e.g. U(34).
     // This is a mitigation for apex extractor matching target sdk version
     // with current prerelease version.
     prerelease: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
+    use_source_config_var: {
+        config_namespace: "widevine_module",
+        var_name: "source_build",
     },
-}
-
-module_apex_set {
-    name: "com.google.android.widevine",
-    apex_name: "com.google.android.widevine",
-    owner: "google",
-    set: "com.google.android.widevine.apks",
-    prefer: true,
-    // TODO(b/251299786): the prerelease field should be removed once
-    // new api version is released, e.g. U(34).
-    // This is a mitigation for apex extractor matching target sdk version
-    // with current prerelease version.
-    prerelease: true,
-    soong_config_variables: {
-        module_build_from_source: {
-            prefer: false,
-        },
-    },
-}
-
+}
\ No newline at end of file