Merge "libsnapshot: Fix crash in MakeXorBlockString test."