Merge "Remove java.nio.file package"