Merge "libfiemap_writer: Calculate FIBMAP blocks correctly."
am: 9d3310c019

Change-Id: I37ff4a029fc722518a11caab744c4f5378e6eb3b