am c1416647: Merge "Clean up internal libc logging."

* commit 'c14166477e7fd22693eab194d37624c2f7506ce4':
  Clean up internal libc logging.