Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain configurations." into android13-tests-dev