am 51851f30: Merge change 3316 into donut

Merge commit '51851f307936a96bbb12acf98cf96979d5ed05bf'

* commit '51851f307936a96bbb12acf98cf96979d5ed05bf':
  Fix make_windows_sdk to make sure we're not creating