am 12ea8005: am 5f829205: am c1416647: Merge "Clean up internal libc logging."

* commit '12ea8005665085ae82c1b233ae93d12855e04b8b':
  Clean up internal libc logging.