diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index a5c80ac0..4ba05807 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -129,7 +129,7 @@ BOARD_USES_GRALLOC_ION_SYNC := true
 BOARD_USES_SWIFTSHADER := false
 
 # This should be the same value as USE_ANGLE in device.mk
-BOARD_USES_ANGLE := true
+BOARD_USES_ANGLE := false
 
 # Gralloc4
 ifeq ($(BOARD_USES_SWIFTSHADER),true)
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index b1a39a9d..275e3176 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -378,6 +378,7 @@ on post-fs-data
 
     # Permissions Camera
     mkdir /data/vendor/camera 0770 system camera
+    mkdir /data/vendor/camera/catpipe 0770 system camera
     mkdir /data/vendor/camera/video_bokeh_node 0770 system camera
     chmod 0755 /sys/kernel/debug/tracing
     restorecon /sys/kernel/debug/tracing/trace_marker
diff --git a/device.mk b/device.mk
index e1d0ab3d..9a45af59 100644
--- a/device.mk
+++ b/device.mk
@@ -203,7 +203,7 @@ endif
 USE_SWIFTSHADER := false
 
 # Must match BOARD_USES_ANGLE in BoardConfig.mk
-USE_ANGLE := true
+USE_ANGLE := false
 
 # HWUI
 TARGET_USES_VULKAN = true