Merge "Remove windows:enabled from skia_deps" am: a7b0f84a0c am: 158b270e10

Original change: https://android-review.googlesource.com/c/platform/external/skia/+/1495316

Change-Id: I8d1960b4c586d1202a700315988979ec5c96b844