Merge "refactor unzip in FileUtil"