Merge "Fix build.gradle file"