am 25fba981: Merge "Do not include libc_common in malloc debug code."

* commit '25fba981a17c51df6cf88d5ace7ffe3c5a5766e4':
  Do not include libc_common in malloc debug code.