Merge branch 'chrome/m54' into merge-m54

Merge branch 'chrome/m54' into merge-m54

Changes:
 - include/core/SkPreConfig.h: they added (_WIN32) like I did
 - gyp/common_conditions.gypi: they modified a line which I had edited to make DLL
 - used theirs for the rest

# Conflicts:
#	gyp/common_conditions.gypi
#	include/core/SkPreConfig.h
#	infra/bots/assets/skimage/VERSION
#	infra/bots/assets/skp/VERSION
#	infra/bots/assets/skp/create.py
#	infra/bots/assets/win_vulkan_sdk/VERSION
#	infra/bots/perf_skia.isolate
#	infra/bots/test_skia.isolate
#	src/pdf/SkPDFMetadata.cpp
#	src/utils/SkRTConf.cpp
#	tests/DFPathRendererTest.cpp
#	tests/PathTest.cpp