Merge "File[Input,Output]Stream : Remove unused code."