More progress on the gradle build.