Merge "Remove calls to is_selinux_enabled()"