Fix bugs in intel-gcm-x86-masm.asm and re-enable the Intel AES assembly

nss.gyp

Index: nss.gyp
diff --git a/nss.gyp b/nss.gyp
index d3be663701ad3760f1c10aef876e5b06b1aa5023..d02d6f7633e575a1e80cb4aa49afd436e45c9298 100644
--- a/nss.gyp
+++ b/nss.gyp
@@ -1171,13 +1171,7 @@
                 'MP_ASSEMBLY_DIV_2DX1D',
                 'MP_USE_UINT_DIGIT',
                 'MP_NO_MP_WORD',
-              ],
-              # 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',
+                'USE_HW_AES',
               ],
               'msvs_settings': {
                 'MASM': {