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

* commit '14799c624985839ef587560d61c67a3565fcac2b':
  Add WriteFdFmt and clean up more code.