Merge "libsnapshot: Add a merge failure code to the update state."