Merge "Remove references to win_sdk" am: 65b493960f

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

Change-Id: I4128a39a88de891ee3a77d9fc8e904d78ea5ee9d