Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev