am dc595d83: Merge "Change ZoneCompator to generate the single "tzdata" file."

* commit 'dc595d830898e5859bf98d7436af2a777a11f810':
  Change ZoneCompator to generate the single "tzdata" file.