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

* commit '4306b0f82b236acb10e1f42e7d850e4edd37fb78':