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

Change-Id: I8f56732c7184d60edfe53086114fc3823202eb8f