am 89715318: am c3d743d2: am 81d88c31: am d920ec83: Fix a Windows-only discrepency in the Windows SDK build.

Merge commit '89715318b22014e2a2a683fe4300dffc2dd5e512'

* commit '89715318b22014e2a2a683fe4300dffc2dd5e512':
  Fix a Windows-only discrepency in the Windows SDK build.