Merge SELinux stuff from CM