am 368d0a31: Merge "make_ext4fs: workaround for a glibc scandir bug"

* commit '368d0a31ffb0613dadd2e6b5e7929d8d7b15f764':
  make_ext4fs: workaround for a glibc scandir bug