am 7c6c10c4: am c78a9e94: am 6c805669: Merge "Add support for jemalloc instead of dlmalloc."

* commit '7c6c10c45968ae2a46402603562d3d6087779eef':
  Add support for jemalloc instead of dlmalloc.