am 400e9bc8: am 47aa1049: Merge "Fixes to make_ext4fs when compiled with HAVE_SELINUX."

* commit '400e9bc8d3c449da234e70abe319bc2670c94298':
  Fixes to make_ext4fs when compiled with HAVE_SELINUX.