gmin-master: Fix build of x86 and backup if build successfully
x64-upstream: Update icu patch