Further fixes for GradleDistribution API change.