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

* commit '5f8292050fc07f4bf9e70f37a807ad028e3cfc87':
  Clean up internal libc logging.