Fix for gradle 2.2 and android-gradle-plugin 1.0.0