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

Change-Id: Iaa7714898fb9ebfdd17883fa62c3277c35ec6f71