Merge change 9397

* changes:
  Fix Win32 libutils to get a working SDK build.