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

Change-Id: Iab24daf0240a93c6826f76e52155c71a4fc96805