Disable Intel AES assembly code on Windows because of memory corruption

nss.gyp

Index: nss.gyp
diff --git a/nss.gyp b/nss.gyp
index f25145222f663fddfa33a4d6f897ee5647f5f608..d3be663701ad3760f1c10aef876e5b06b1aa5023 100644
--- a/nss.gyp
+++ b/nss.gyp
@@ -1171,7 +1171,13 @@
                 'MP_ASSEMBLY_DIV_2DX1D',
                 'MP_USE_UINT_DIGIT',
                 'MP_NO_MP_WORD',
-                'USE_HW_AES',
+              ],
+              # intel-gcm-x86-masm.asm seems to corrupt memory, so disable all
+              # Intel AES assembly code. (http://crbug.com/367515)
+              'sources!': [
+                'nss/lib/freebl/intel-aes-x86-masm.asm',
+                'nss/lib/freebl/intel-gcm-wrap.c',
+                'nss/lib/freebl/intel-gcm-x86-masm.asm',
               ],
               'msvs_settings': {
                 'MASM': {
@@ -1194,7 +1200,7 @@
                 'nss/lib/freebl/intel-aes-x86-masm.asm',
                 'nss/lib/freebl/intel-gcm-wrap.c',
                 'nss/lib/freebl/intel-gcm-x64-masm.asm',
-                'nss/lib/freebl/intel-aes-x86-masm.asm',
+                'nss/lib/freebl/intel-gcm-x86-masm.asm',
                 'nss/lib/freebl/mpi/mpi_amd64.c',
                 'nss/lib/freebl/mpi/mpi_x86_asm.c',
               ],