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)