Merge "Fix libdl inclusion for default-ub."