am c690332c: Merge "Revert "init re-execs to set its security context now.""

* commit 'c690332c5e4008d0f58d7a356311a821ef07d0cf':
  Revert "init re-execs to set its security context now."

etc/init.rc

@@ -1,6 +1,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