Fix binpatch and systeminfo MSVC build. svn path=/trunk/; revision=67550
svn path=/trunk/; revision=67434