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

* commit '4996c8073e87dd9e361b385d8aeb121f4c36a221':
  Fix the win_sdk build.