Merge "[base] Migrate deprecated Vk GrBackendSurface related functions" into main