Merge "Revert "libsnapshot: compile tests for both 32 and 64 bit"" into main