Merge "Tweak the location of the tz module ICU file"