Updated gradle plugin and build-tools