Merge "libsnapshot: Fix test failures on certain configurations."