Merge "libsnapshot: Changes to AddCopy() API"