Added more tweaks to convention plugins setup

gradle.properties

@@ -1,5 +1,4 @@
 # Configure your build environment: http://www.gradle.org/docs/current/userguide/build_environment.html
-android.disallowKotlinSourceSets=false
 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true