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

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