Removed some unnecessary folders from build.gradle
Merge branch 'gradle'