Merge "Exclude jdiff from build"