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

Change-Id: I8fb6339055a5bed872d72cd3c1aa002863977648