am 485b2617: am 14799c62: Merge "Add WriteFdFmt and clean up more code."

* commit '485b2617de033f6fdb8ef6cfb664778713078116':
  Add WriteFdFmt and clean up more code.