Merge "Change ZoneCompator to generate the single "tzdata" file."