followed latest version of build tools.
Merge branch 'hotfix/gradle_plugin_0.9.+'