am 5d2065c5: am e1a55004: Add WriteFdFmt and clean up more code.

* commit '5d2065c5d24ced94906f1226e93efc179e95fb95':
  Add WriteFdFmt and clean up more code.