Merge "libsnapshot: Use words for xor ops" into main