added migration fixes for android.tools.build:gradle:0.11.+
Merge pull request #841 from vkrivenko/android-gradle-0.11-fix

added migration fixes for android.tools.build:gradle:0.11.+