Merge "Mount selinuxfs when other filesystems are mounted"