Improve gradle build.