Merge "libfiemap_writer: Allow callers to query the block device of a file." am: 2c32a6cf24 am: 281a0f2174
am: f6e70f8c21

Change-Id: I1559495d3e247c7e4fe67e9c13e20e32ea4637e0