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

Change-Id: Ia8342b273c3b450e00a0f7bd5945d01fd35f0b33