Fix some gyp errors found with --check.

Running check will error out until NaCl problems are fixed (CL pending).

TEST=src/build/gyp_chromium --check

Review URL: http://codereview.chromium.org/1239002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@42547 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

common.gypi

@@ -544,17 +544,12 @@
         'msvs_settings': {
           'VCLinkerTool': {
             'TargetMachine': '17', # x86 - 64
-          },
-        },
-        'msvs_settings': {
-          'VCLibrarianTool': {
             'AdditionalLibraryDirectories!':
               ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
             'AdditionalLibraryDirectories':
               ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'],
           },
-          'VCLinkerTool': {
-            'TargetMachine': '17',
+          'VCLibrarianTool': {
             'AdditionalLibraryDirectories!':
               ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
             'AdditionalLibraryDirectories':