Use bionic's dlmalloc 2.8.5.

Also fix free space computations for DDMS.

Change-Id: Icbc045b5461af89a0516f37f01acaaa815205348
diff --git a/build/Android.common.mk b/build/Android.common.mk
index bed1314..7dbe04c 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -157,7 +157,7 @@
 	src/disassembler_arm.cc \
 	src/disassembler_mips.cc \
 	src/disassembler_x86.cc \
-	src/dlmalloc.c \
+	src/dlmalloc.cc \
 	src/file.cc \
 	src/file_linux.cc \
 	src/heap.cc \