diff --git a/libwvdrmengine/apex/Android.bp b/libwvdrmengine/apex/Android.bp
index e91c5ad7..d36d951f 100644
--- a/libwvdrmengine/apex/Android.bp
+++ b/libwvdrmengine/apex/Android.bp
@@ -66,14 +66,13 @@ apex {
     prebuilts: [
         "com.google.android.widevine.rc",
         "widevine-linker-config",
+        "com.google.android.widevine.xml",  // etc/vintf
     ],
     defaults: [
         "com.google.android.widevine-defaults",
         "com.google.android.widevine-key-defaults",
     ],
     binaries: ["android.hardware.drm-service.widevine"],
-    // TODO(b/239054171) embed vintf_fragment in the apex.
-    vintf_fragments: ["com.google.android.widevine.xml"],
     file_contexts: "file_contexts",
     use_vndk_as_stable: true,
     updatable: false,
@@ -106,6 +105,13 @@ prebuilt_etc {
     src: "com.google.android.widevine.rc",
 }
 
+prebuilt_etc {
+    name: "com.google.android.widevine.xml",
+    src: "com.google.android.widevine.xml",
+    sub_dir: "vintf",
+    installable: false,
+}
+
 prebuilt_etc {
     name: "allowlist_com.google.android.widevine.xml",
     src: "allowlist_com.google.android.widevine.xml",