diff --git a/device.mk b/device.mk
index cf12b257..35064892 100644
--- a/device.mk
+++ b/device.mk
@@ -30,6 +30,7 @@ include device/google/gs-common/radio/dump.mk
 include device/google/gs-common/gear/dumpstate/aidl.mk
 include device/google/gs-common/camera/dump.mk
 include device/google/gs-common/gps/dump/log.mk
+include device/google/gs-common/widevine/widevine.mk
 
 TARGET_BOARD_PLATFORM := gs101
 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)
@@ -215,6 +216,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 
 # Mali Configuration Properties
 PRODUCT_VENDOR_PROPERTIES += \
+	vendor.mali.platform.config=/vendor/etc/mali/platform.config \
+	vendor.mali.debug.config=/vendor/etc/mali/debug.config \
 	vendor.mali.base_protected_max_core_count=3 \
 	vendor.mali.base_protected_tls_max=67108864 \
 	vendor.mali.platform_agt_frequency_khz=24576
@@ -531,10 +534,7 @@ PRODUCT_PACKAGES += \
 
 # WideVine modules
 PRODUCT_PACKAGES += \
-	android.hardware.drm-service.clearkey \
-	liboemcrypto \
-
--include vendor/widevine/libwvdrmengine/apex/device/device.mk
+	liboemcrypto
 
 $(call soong_config_set,google3a_config,soc,gs101)
 $(call soong_config_set,google3a_config,gcam_awb,true)