Merge "libsnapshot: MapSnapshot: use device string for inner device"