Merge pull request #10180 from nxhack/icu_uclibc