Fixes to vcxproj builder.

Change-Id: Ifea880b4bcdaf26ffff767c477b3dbdc7072d246
Reviewed-on: http://www.matthewh.me/gerrit/41
Reviewed-by: Matthew Hoggan <mehoggan@gmail.com>
Tested-by: Matthew Hoggan <mehoggan@gmail.com>