Update dependencies in build.gradle
Merge branch 'update-build'