Fix create_installer_archive.py to be more flexible with output directory names

chrome/installer/mini_installer.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'dependencies': [
     '<(chrome_dll_project)',
     '../chrome.gyp:app_host',
     '../chrome.gyp:chrome',
     '../chrome.gyp:chrome_nacl_win64',
     '../chrome.gyp:default_extensions',
@@ skipping 163 matching lines @@
         }, {
           'variables': {
             'enable_touch_ui_flag': '',
           },
         }],
         ['target_arch=="x64"', {
           'inputs!': [
             '<(PRODUCT_DIR)/nacl64.exe',
             '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
           ],
+          'variables': {
+            'target_arch_flag': '--target_arch=x64',
+          },
+        }, {
+          'variables': {
+            'target_arch_flag': '--target_arch=x86',
+          },
         }],
       ],
       'inputs': [
         '<(create_installer_archive_py_path)',
         '<(PRODUCT_DIR)/app_host.exe',
         '<(PRODUCT_DIR)/chrome.exe',
         '<(chrome_dll_path)',
         '<(PRODUCT_DIR)/nacl64.exe',
         '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
         '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
@@ skipping 11 matching lines @@
       'action': [
         'python',
         '<(create_installer_archive_py_path)',
         '--build_dir=<(PRODUCT_DIR)',
         '--output_dir=<(output_dir)',
         '--staging_dir=<(INTERMEDIATE_DIR)',
         '--input_file=<(RULE_INPUT_PATH)',
         '--resource_file_path=<(INTERMEDIATE_DIR)/packed_files.rc',
         '<(enable_hidpi_flag)',
         '<(enable_touch_ui_flag)',
+        '<(target_arch_flag)',
         # TODO(sgk):  may just use environment variables
         #'--distribution=$(CHROMIUM_BUILD)',
         '--distribution=_google_chrome',
         # Optional arguments to generate diff installer
         #'--last_chrome_installer=C:/Temp/base',
         #'--setup_exe_format=DIFF',
         #'--diff_algorithm=COURGETTE',
       ],
       'message': 'Create installer archive'
     },
@@ skipping 10 matching lines @@
       'variables': {
          'branding_dir': '../app/theme/google_chrome',
       },
     }, { # else branding!="Chrome"
       'variables': {
          'branding_dir': '../app/theme/chromium',
       },
     }],
   ],
 }