Merge "Move more folks to FileUtils.copy()."