Updates for compatibility with Android Studio 2.2#89

xelnaga wants to merge 3 commits intosaturday06:mastersaturday06/gradle-android-scala-plugin:masterfrom

xelnaga:2.2xelnaga/gradle-android-scala-plugin:2.2Copy head branch name to clipboard