Merge "gen_msvs_*proj.sh: add 'cpp' as a source extension"