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

Change-Id: Ice4f2b39fb97cbda876e2b136a00834952c22e0d