Merge "Fixed method resolution from Android Gradle plugin in build.gradle editor." into studio-1.0-release