Merge "Fix bug in dlmalloc\'s version of calloc."
am: 9f20db1c94

* commit '9f20db1c94446624238f452d5fc0200444d2ea05':
  Fix bug in dlmalloc's version of calloc.