Merge "libfiemap_writer: Improve device unwrapping to support simple linear devices."