am 7ad271e7: Merge "Update windows sdk to build non-recursively"

* commit '7ad271e7742a904485c8fdf51206ba068bf5160f':
  Update windows sdk to build non-recursively