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

Change-Id: I3e6dca9d52a8ad8bc7002547cf125ad388cafcde