Merge "Port further java.io classes"