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)