am 32ea9fe5: Merge "Put all the tzdata in one file."

* commit '32ea9fe5783e3cc9756205c0ac46482afc700a3d':
  Put all the tzdata in one file.