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

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

Change-Id: I3b676afb525842dd6f6ef83a836e00c4eef4fe2c