Merge "Remove references to win_sdk"