Merge "libsnapshot: Fix vts_libsnapshot_test for GRF with Vendor on S"