Merge "libsnapshot: MapSnapshot: use device string for inner device"
am: 24815a49d4

Change-Id: I48c32c805c18c685640629c380b2ea497560a75c