Merge new build.gradle from develop branch