Merge "Clean up warnings in the malloc_debug_* files."