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

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