am a63b7d59: Merge "Fix Windows SDK build."

* commit 'a63b7d595b9cb35b7493662daf8840835229c7fb':
  Fix Windows SDK build.