am e5b85f45: am 0d7177c0: Merge "Clean up warnings in the malloc_debug_* files."

* commit 'e5b85f45f9b23b4adbea5a9bb0bc29099880ed69':
  Clean up warnings in the malloc_debug_* files.