Update for latest gradle and build-tools.