am c1be1ecc: am 011076b7: Merge "Support for jemalloc to replace dlmalloc."

* commit 'c1be1eccbb22e136de933824cd003c1dad9b17e5':
  Support for jemalloc to replace dlmalloc.