Merge "libfiemap_writer: Fix bugs in vfat handling."