Fixing gradle build for newest android studio