Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/freebl/ecl/ecp_256_32.c

Index: nss/lib/freebl/ecl/ecp_256_32.c
diff --git a/nss/lib/freebl/ecl/ecp_256_32.c b/nss/lib/freebl/ecl/ecp_256_32.c
index 815cc91a386f8e485b67ec1f0fcb6b25f04ee8c3..cd8cd23846dfab2cc90b68b883a34ef733cb39cc 100644
--- a/nss/lib/freebl/ecl/ecp_256_32.c
+++ b/nss/lib/freebl/ecl/ecp_256_32.c
@@ -1254,12 +1254,12 @@ static void scalar_mult(felem nx, felem ny, felem nz,
 #define BYTESWAP64(x) OSSwapInt64(x)
 #else
 #define BYTESWAP32(x) \
-    ((x) >> 24 | (x) >> 8 & 0xff00 | ((x) & 0xff00) << 8 | (x) << 24)
+    (((x) >> 24) | (((x) >> 8) & 0xff00) | (((x) & 0xff00) << 8) | ((x) << 24))
 #define BYTESWAP64(x) \
-    ((x) >> 56 | (x) >> 40 & 0xff00 | \
-     (x) >> 24 & 0xff0000 | (x) >> 8 & 0xff000000 | \
-     ((x) & 0xff000000) << 8 | ((x) & 0xff0000) << 24 | \
-     ((x) & 0xff00) << 40 | (x) << 56)
+    (((x) >> 56) | (((x) >> 40) & 0xff00) | \
+     (((x) >> 24) & 0xff0000) | (((x) >> 8) & 0xff000000) | \
+     (((x) & 0xff000000) << 8) | (((x) & 0xff0000) << 24) | \
+     (((x) & 0xff00) << 40) | ((x) << 56))
 #endif
 
 #ifdef MP_USE_UINT_DIGIT