am e3d3016d: Merge "Switch from using base64 BIOs to encoding funcs."

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