NaCl: Remove use of NACL_BUILD_* in common.gypi.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index a391a6bfe9f588edb1e578798d5be382f45974ec..bc6bf2bf767df99608b8ba171e0063d3a1bbbb43 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -187,12 +187,6 @@
     'target_conditions': [
       ['win_target=="x64"', {
         'target_arch': 'x64',
-        'defines!': [
-          'NACL_BUILD_SUBARCH=32',
-        ],
-        'defines': [
-          'NACL_BUILD_SUBARCH=64',
-        ],
         'configurations': {
           'Common_Base': {
             'msvs_target_platform': 'x64',
@@ -201,31 +195,6 @@
       }],
     ],
     'conditions': [
-      # TODO(gregoryd): split target and build subarchs
-      ['target_arch=="ia32"', {
-        'defines': [
-          'NACL_BUILD_SUBARCH=32',
-          'NACL_BUILD_ARCH=x86',
-        ],
-      }],
-      ['target_arch=="x64"', {
-        'defines': [
-          'NACL_BUILD_SUBARCH=64',
-          'NACL_BUILD_ARCH=x86',
-        ],
-      }],
-      ['target_arch=="arm"', {
-        'defines': [
-          'NACL_BUILD_ARCH=arm',
-          'NACL_BUILD_SUBARCH=32',
-        ],
-      }],
-      ['target_arch=="mipsel"', {
-        'defines': [
-          'NACL_BUILD_ARCH=mips',
-          'NACL_BUILD_SUBARCH=32',
-        ],
-      }],
       ['linux2==1', {
         'defines': ['LINUX2=1'],
       }],