Merge "libfiemap_writer: Fix bugs in vfat handling." am: 7f6d6db24d am: 22a01eed3a
am: 1912bda2d8

Change-Id: I8f8189eaf7582d8f7ef628a4672ec5b991895604