Merge "Do not include libc_common in malloc debug code."