Merge "Use dlmalloc from external/dlmalloc instead of bionic/." am: 506d233e7a
am: 7f3dd26610

* commit '7f3dd26610c018c05d93480d8af2c4a813507efc':
  Use dlmalloc from external/dlmalloc instead of bionic/.