Merge "[base] Update deprecated GrVk type names" into main