Merge "Remove a workaround for an icu4c header file hack."