Merge "Remove unused files from sun.nio.ch package"