Change name of build dir when --without-tcmalloc (#507)
Merge review 397 by @srh (Closes #507)
Merge branch 'next' into sam_207