Merge "libfiemap_writer: Improve device unwrapping to support simple linear devices." am: 87db478ad6
am: 7a7a88e84a

Change-Id: I5c158e42f74eac3de31b29b4eecb8e51eba89103