diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index 4ec3b5c..8e3fe3c 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -21,7 +21,7 @@
 #ifndef _BDROID_BUILDCFG_H
 #define _BDROID_BUILDCFG_H
 
-#include <cutils/properties.h>
+//#include <cutils/properties.h>
 #include <string.h>
 
 static inline const char* BtmDefLocalName()
diff --git a/ld.config.27.txt b/ld.config.27.txt
index 8aa3369..f241e29 100644
--- a/ld.config.27.txt
+++ b/ld.config.27.txt
@@ -58,7 +58,7 @@ namespace.default.asan.permitted.paths = /data/asan/system/${LIB}:/system/${LIB}
 namespace.sphal.isolated = true
 namespace.sphal.visible = true
 namespace.sphal.search.paths = /vendor/${LIB}/egl:/vendor/${LIB}/hw:/vendor/${LIB}
-namespace.sphal.permitted.paths = /vendor/${LIB}:/system/${LIB}/vndk-sp/hw
+namespace.sphal.permitted.paths = /vendor/${LIB}:/system/${LIB}/vndk-sp-27/hw
 
 namespace.sphal.asan.search.paths = /data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl:/data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}:/vendor/${LIB}
 namespace.sphal.asan.permitted.paths = /data/asan/vendor/${LIB}:/vendor/${LIB}
@@ -86,10 +86,10 @@ namespace.sphal.link.rs.shared_libs = libRS_internal.so
 ###############################################################################
 namespace.rs.isolated = true
 namespace.rs.visible = true
-namespace.rs.search.paths = /vendor/${LIB}/vndk-sp:/system/${LIB}/vndk-sp:/vendor/${LIB}
+namespace.rs.search.paths = /vendor/${LIB}/vndk-sp:/system/${LIB}/vndk-sp-27:/vendor/${LIB}
 namespace.rs.permitted.paths = /vendor/${LIB}:/data
 
-namespace.rs.asan.search.paths = /data/asan/vendor/${LIB}/vndk-sp:/vendor/${LIB}/vndk-sp:/data/asan/system/${LIB}/vndk-sp:/system/${LIB}/vndk-sp:/data/asan/vendor/${LIB}:/vendor/${LIB}
+namespace.rs.asan.search.paths = /data/asan/vendor/${LIB}/vndk-sp:/vendor/${LIB}/vndk-sp:/data/asan/system/${LIB}/vndk-sp-27:/system/${LIB}/vndk-sp-27:/data/asan/vendor/${LIB}:/vendor/${LIB}
 namespace.rs.asan.permitted.paths = /data/asan/vendor/${LIB}:/vendor/${LIB}:/data
 
 namespace.rs.links = default,vndk
@@ -103,7 +103,7 @@ namespace.rs.link.vndk.shared_libs = android.hardware.renderscript@1.0.so:androi
 ###############################################################################
 namespace.vndk.isolated = true
 namespace.vndk.visible = true
-namespace.vndk.search.paths = /vendor/${LIB}/vndk-sp:/system/${LIB}/vndk-sp
+namespace.vndk.search.paths = /vendor/${LIB}/vndk-sp:/system/${LIB}/vndk-sp-27
 namespace.vndk.permitted.paths = /vendor/${LIB}/hw:/vendor/${LIB}/egl
 
 namespace.vndk.asan.search.paths = /data/asan/vendor/${LIB}/vndk-sp:/vendor/${LIB}/vndk-sp:/data/asan/system/${LIB}/vndk-sp:/system/${LIB}/vndk-sp
@@ -123,6 +123,6 @@ namespace.vndk.link.default.shared_libs = android.hidl.memory@1.0-impl.so:libc.s
 ###############################################################################
 [vendor]
 namespace.default.isolated = false
-namespace.default.search.paths = /vendor/${LIB}/hw:/vendor/${LIB}/egl:/vendor/${LIB}:/system/${LIB}/vndk:/vendor/${LIB}/vndk-sp:/system/${LIB}/vndk-sp:/system/${LIB}
+namespace.default.search.paths = /vendor/${LIB}/hw:/vendor/${LIB}/egl:/vendor/${LIB}:/system/${LIB}/vndk-27:/vendor/${LIB}/vndk-sp:/system/${LIB}/vndk-sp-27:/system/${LIB}
 
 namespace.default.asan.search.paths = /data/asan/vendor/${LIB}/hw:/vendor/${LIB}/hw:/data/asan/vendor/${LIB}/egl:/vendor/${LIB}/egl:/data/asan/vendor/${LIB}:/vendor/${LIB}:/data/asan/system/${LIB}/vndk:/system/${LIB}/vndk:/data/asan/vendor/${LIB}/vndk-sp:/vendor/${LIB}/vndk-sp:/data/asan/system/${LIB}/vndk-sp:/system/${LIB}/vndk-sp:/data/asan/system/${LIB}:/system/${LIB}
diff --git a/sepolicy/su.te b/sepolicy/su.te
index 6da7f6d..cc0785d 100644
--- a/sepolicy/su.te
+++ b/sepolicy/su.te
@@ -14,7 +14,7 @@ allow { appdomain shell } phhsu_exec:file { getattr read open execute execute_no
 
 create_pty(shell)
 allowxperm shell devpts:chr_file ioctl TCSETSF;
-allowxperm untrusted_app untrusted_app_devpts:chr_file ioctl TCSETSF;
+#allowxperm untrusted_app untrusted_app_devpts:chr_file ioctl TCSETSF;
 
 allow servicemanager phhsu_daemon:dir { search read };
 allow servicemanager phhsu_daemon:file { open read };
@@ -40,9 +40,9 @@ net_domain(phhsu_daemon)
 hwbinder_use(phhsu_daemon)
 
 allow phhsu_daemon toolbox_exec:file { read open execute_no_trans };
-allow phhsu_daemon untrusted_app_devpts:chr_file { getattr };
+#allow phhsu_daemon untrusted_app_devpts:chr_file { getattr };
 allow phhsu_daemon zygote_exec:file { execute read open execute_no_trans getattr };
 
-allow phhsu_daemon phhsu_daemon:capability { setuid setgid dac_override chown};
+#allow phhsu_daemon phhsu_daemon:capability { setuid setgid dac_override chown};
 
 allow appdomain phhsu_daemon:dir { search };