Update to build with the latest Build Tools and Gradle versions