Merge "fiemap_writer: Add a progress notification." am: dec436438a
am: 3b7f64d323

Change-Id: Ia827d8dc68460779ad4e0946aa5d7b67043ef7ed