Merge "libsnapshot: Return path if snapshot is already merged" am: 9ae5a6ccaa am: b3eae7bf4b
am: 5e805cdc7f

Change-Id: I27e948cc5f462a58d324b82f5857bb00d284b9cd