Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev