I think some files were overwritten by the Setup utility. Did you switch to the VXGI branch before or after running Setup.bat? The way I do is
(1) git clone the default release branch
(2) run setup.bat;
(3) git branch VXGI origin/VXGI
(4) git checkout VXGI
(5) generate project files
(6) build
–