Updated to latest Android Gradle Plugin