Merge "libfiemap_writer: Handle dm stacking more accurately."