am 9005ec37: am 825b3b11: Merge "Switch from using base64 BIOs to encoding funcs."

* commit '9005ec378ecd281f52945b5baca87245543bbfbf':
  Switch from using base64 BIOs to encoding funcs.