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

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

Change-Id: I11338ea320d6d28ff21a7d0fcf6027387f1bf0d9