Fix for build on jdk8 and slower machines + reverted build.gradle to Unix eol