Merge "Revert "Move ICU into i18n APEX""