Gradle rework for 19.1.0 with AARs