diff --git a/.prebuilt_info/nonupdatable/prebuilt_info_libwvdrmengine_apex_prebuilt_com_google_android_widevine_nonupdatable_apks.asciipb b/.prebuilt_info/nonupdatable/prebuilt_info_libwvdrmengine_apex_prebuilt_com_google_android_widevine_nonupdatable_apks.asciipb
deleted file mode 100644
index 1f2665ae..00000000
--- a/.prebuilt_info/nonupdatable/prebuilt_info_libwvdrmengine_apex_prebuilt_com_google_android_widevine_nonupdatable_apks.asciipb
+++ /dev/null
@@ -1,15 +0,0 @@
-drops {
-  android_build_drop {
-    build_id: "9591839"
-    target: "mainline_modules-user"
-    source_file: "dev_keys_signed/com.google.android.widevine.nonupdatable/com.google.android.widevine.nonupdatable.apks"
-  }
-  dest_file: "libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks"
-  version: ""
-  version_group: ""
-  git_project: "platform/vendor/widevine"
-  git_branch: "master"
-  transform: TRANSFORM_NONE
-  transform_options {
-  }
-}
diff --git a/libwvdrmengine/apex/nonupdatable/device.mk b/libwvdrmengine/apex/nonupdatable/device.mk
deleted file mode 100644
index 018fa836..00000000
--- a/libwvdrmengine/apex/nonupdatable/device.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-PRODUCT_PACKAGES += \
-	com.google.android.widevine.nonupdatable \
-
-# Check if we can use dev keys
-ifneq ($(wildcard vendor/google/dev-keystore),)
-$(call soong_config_set,widevine,use_devkey,true)
-endif
-
-PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS += \
-	vendor/widevine/libwvdrmengine/apex/device/linker.config.json
\ No newline at end of file