diff --git a/BoardConfig.mk b/BoardConfig.mk
index f02bd40c6..5fa5fb9d4 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -138,6 +138,8 @@ TARGET_TOUCHBOOST_FREQUENCY:= 1200
 
 USE_DEVICE_SPECIFIC_QCOM_PROPRIETARY:= true
 USE_DEVICE_SPECIFIC_CAMERA:= true
+TARGET_HAS_LEGACY_CAMERA_HAL1 := true
+
 TARGET_NEEDS_PLATFORM_TEXT_RELOCATIONS:= true
 
 ifeq ($(USE_SVELTE_KERNEL),true)
diff --git a/device.mk b/device.mk
index f080cf809..32dd33789 100644
--- a/device.mk
+++ b/device.mk
@@ -349,7 +349,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Camera configuration
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
-    camera.disable_zsl_mode=1
+    camera.disable_zsl_mode=1 \
+    media.stagefright.legacyencoder=true \
+    media.stagefright.less-secure=true
 
 # Input resampling configuration
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/sepolicy/mediaserver.te b/sepolicy/mediaserver.te
index f82f16d40..66946e7a9 100644
--- a/sepolicy/mediaserver.te
+++ b/sepolicy/mediaserver.te
@@ -7,3 +7,8 @@ unix_socket_send(mediaserver, mpdecision, mpdecision)
 # Permit mediaserver to create sockets with no specific SELinux class.
 # TODO: Investigate the specific type of socket.
 allow mediaserver self:socket create_socket_perms;
+
+allow mediaserver camera_device:chr_file rw_file_perms;
+allow mediaserver audio_device:chr_file rw_file_perms;
+
+allow mediaserver system_file:file execmod;