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

Change-Id: Ifb77d26e7e915b42fa852bd22869a4c2b8cb9b00