Merge "Use dlmalloc from external/dlmalloc instead of bionic/."
am: 4fe6ce5f48

* commit '4fe6ce5f48687cf24c91ac9865dbad497ed6c074':
  Use dlmalloc from external/dlmalloc instead of bionic/.