Merge "libsnapshot: Refactor WriteSnapshotAndHash."