Update to compile on modern Gradle and latest SDK