Couple additional Windows build fixes in VCX files

(cherry picked from commit f2d6b1b8)
14 jobs for 543-couple-more-windows-build-fixes-v9_12 in 7 minutes and 33 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Precheck
passed #60861
amd64 docker linux
precheck:debian:sid:amd64

00:00:18

 
  Build
passed #60862
amd64 docker linux
build:centos:centos6:amd64

00:02:07

passed #60863
amd64 docker linux
build:centos:centos7:amd64

00:02:17

passed #60864
amd64 docker linux
build:debian:sid:amd64

00:01:31

passed #60865
i386 docker linux
build:debian:sid:i386

00:01:36

 
  Test
passed #60874
amd64 docker linux
install:debian:sid:amd64

00:02:20

passed #60870
amd64 docker linux
systemtest:centos:centos6:amd64

00:04:41

passed #60871
amd64 docker linux
systemtest:centos:centos7:amd64

00:04:41

passed #60872
amd64 docker linux
systemtest:debian:sid:amd64

00:04:45

passed #60873
i386 docker linux
systemtest:debian:sid:i386

00:04:54

passed #60866
amd64 docker linux
unittest:centos:centos6:amd64

00:00:52

passed #60867
amd64 docker linux
unittest:centos:centos7:amd64

00:01:03

passed #60868
amd64 docker linux
unittest:debian:sid:amd64

00:00:45

passed #60869
i386 docker linux
unittest:debian:sid:i386

00:00:56