Merge "Revert "Migrate vts_libsnapshot_test and friends to general-tests zip"" into main