Merge "Fixes to make_ext4fs when compiled with HAVE_SELINUX."