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

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

Change-Id: I708d6b5cb57afc536613993ce47e17a61270033c