Merge "libfiemap: Add a way to get the block device path of a mapped image." am: 31a35038a0 am: fa61f9172a am: 600c0ad321

Change-Id: I579621200ca33a5fa297ff9d03122bf44ce083bc