diff --git a/core/main.mk b/core/main.mk
index 3cab933..06a1fdf 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -277,6 +277,8 @@
 else # !sdk
 endif
 
+BUILD_WITHOUT_PV := true
+
 ## precise GC ##
 
 ifneq ($(filter dalvik.gc.type-precise,$(PRODUCT_TAGS)),)
diff --git a/target/product/core.mk b/target/product/core.mk
index f87ee46..8ee073a 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -43,6 +43,3 @@
     PackageInstaller \
     DefaultContainerService \
     Bugreport
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    media.stagefright.enable-record=true