Merge "make_ext4fs: workaround for a glibc scandir bug"