Merge "[base] Use newer GrDirectContexts::MakeVulkan" into main