Merge "Fix bug in dlmalloc's version of calloc."