gradle upgrade and fixes to work with android-studio
android studio ignores