Merge "Remove references to win_sdk" am: 65b493960f am: d5395d93a4 am: 2e8c595080 am: 247624e6d6

Original change: https://android-review.googlesource.com/c/platform/development/+/1936081

Change-Id: I728a983d92cd826e10b7ff02e94cc4e2a89cb179