Update to newest build tools and patch to integrate it in our Gradle build