Merge "Fix update-tzdata.py to rebuild icu4c .dat file."