diff --git a/Android.mk b/Android.mk
index 1fc8c53..9dc31a5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -344,7 +344,8 @@
     dosfsck \
     dosfslabel \
     fsck_msdos_symlink \
-    mkdosfs
+    mkdosfs \
+    permissive.sh
 
 ifneq ($(TARGET_ARCH), arm64)
     ifneq ($(TARGET_ARCH), x86_64)
diff --git a/etc/init.rc b/etc/init.rc
index 3cf5d4c..f0af6be 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -2,6 +2,13 @@
 import /init.recovery.${ro.hardware}.rc
 
 on early-init
+    # Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
+    write /sys/fs/selinux/checkreqprot 0
+
+    # Set the security context for the init process.
+    # This should occur before anything else (e.g. ueventd) is started.
+    setcon u:r:init:s0
+
     start ueventd
     start healthd