Merge change 3316 into donut

* changes:
  Fix make_windows_sdk to make sure we're not creating files as directories :-)