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

Change-Id: I3d43dc00a46b9ef212a333e912b4bc1da67ed90b