Revert "Add support in NaCl browser tests for testing pnacl-translated nexes"

ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp

 # 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.
 
 {
   'includes': [
     '../../../../../native_client/build/untrusted.gypi',
   ],
   'targets': [
     {
       'target_name': 'pnacl_irt_shim',
       'type': 'none',
       'variables': {
         'nlib_target': 'pnacl_irt_shim.a',
-        'out_newlib64': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_pnacl/lib-x86-64/libpnacl_irt_shim.a',
-        'out_newlib_arm': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_pnacl/lib-arm/libpnacl_irt_shim.a',
+        'out_newlib64': '<(PRODUCT_DIR)/libpnacl_irt_shim.a',
+        'out_newlib_arm': '<(PRODUCT_DIR)/libpnacl_irt_shim.a',
         'build_glibc': 0,
         'build_newlib': 1,
         'sources': [
           'pnacl_shim.c',
           'shim_entry.c',
           'shim_ppapi.c',
         ],
         'include_dirs': [
           '../../../..',
         ],
         'conditions': [
           ['target_arch=="arm"', {
             'compile_flags': [
               '--pnacl-allow-translate',
               '--pnacl-allow-native',
               '-arch', 'arm',
             ],
           }],
         ],
       },
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
       ],
     },
   ],
 }