am 8537b614: am 4996c807: Merge "Fix the win_sdk build."

* commit '8537b6145ad275d6fb40e5be4286ff43eaace868':
  Fix the win_sdk build.