Merge "Remove manual U_TIMEZONE definition."