am 29b53d3d: Merge "Moved a BufferedOutputStream onto the heap to reduce stack usage."

* commit '29b53d3d715b1ec19349e8cbf7c5e4ff529bd5fe':
  Moved a BufferedOutputStream onto the heap to reduce stack usage.