Merge "update-tzdata.py needs to know where to find icu."