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

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