Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/softoken/softkver.c

Index: nss/lib/softoken/softkver.c
diff --git a/nss/lib/softoken/softkver.c b/nss/lib/softoken/softkver.c
index de21bfef3625d5b6b2a8a61fbacdb8596203ab35..3f20fad2743c97713571f9d6d7922e34073f88d5 100644
--- a/nss/lib/softoken/softkver.c
+++ b/nss/lib/softoken/softkver.c
@@ -13,12 +13,6 @@
 #endif
 
 /*
- * Version information for the 'ident' and 'what commands
- *
- * NOTE: the first component of the concatenated rcsid string
- * must not end in a '$' to prevent rcs keyword substitution.
+ * Version information
  */
-const char __nss_softokn_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_softokn_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_softokn_version[] = "Version: NSS " SOFTOKEN_VERSION _DEBUG_STRING;