Merge "Temporarily disable rs/bcc in win_sdk"