Couple additional Windows build fixes in VCX files

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

00:00:17

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

00:02:28

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

00:02:56

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

00:01:57

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

00:02:01

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

00:02:06

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

00:04:29

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

00:04:48

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

00:04:35

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

00:05:02

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

00:01:01

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

00:01:04

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

00:00:58

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

00:00:53