Merge "Remove libvendorsupport.so from the filediff allowlist" into main