Merge "Add back StreamUtil#closeStream(OutputStream)"