CHANGE: @W-18163361@ Clean up lingering v4 build changes#1869

randi274 merged 2 commits intodevforcedotcom/code-analyzer:devfrom

randi/W-18163361-v4-cleanupforcedotcom/code-analyzer:randi/W-18163361-v4-cleanupCopy head branch name to clipboard