Merge "libfiemap_writer: Calculate FIBMAP blocks correctly."