Merge "Fix ExtractEntryToFile."