Merge "Clean up internal libc logging."