Merge "Functional changes for java.io.[ILO]* ojdk8 port"