diff --git a/device.mk b/device.mk
index 1d24a50f..08d0a637 100755
--- a/device.mk
+++ b/device.mk
@@ -17,13 +17,11 @@
 # Enable updating of APEXes
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 
-ifneq (,$(filter 27, $(PRODUCT_EXTRA_VNDK_VERSIONS)))
-    _vndk_test := true
-endif
+# Disable APEX compression
+# Keep this after including updatable_apex.mk
+PRODUCT_COMPRESSED_APEX := false
 
-ifeq (,$(_vndk_test))
 PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
-endif
 PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE := true
 
 PRODUCT_SOONG_NAMESPACES += \
@@ -262,13 +260,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.radio.always_send_plmn=false\
     persist.rcs.supported=1
 
-ifeq (,$(_vndk_test))
 PRODUCT_PROPERTY_OVERRIDES += \
     vendor.rild.libpath=/vendor/lib64/libril-qc-qmi-1.so
-else
-PRODUCT_PROPERTY_OVERRIDES += \
-    rild.libpath=/vendor/lib64/libril-qc-qmi-1.so
-endif
 
 # Disable snapshot timer
 PRODUCT_PROPERTY_OVERRIDES += \