Merge "gen_msvs_vcxproj.sh: Avoid object name collisions."