Fixed the build for the broken pieces the Gradle update left in its wake.