Updated to latest Android Gradle plugin