Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/nss/nssver.c

Index: nss/lib/nss/nssver.c
diff --git a/nss/lib/nss/nssver.c b/nss/lib/nss/nssver.c
index e2aa0cec56b8c23e9666b6fd4774662b9e10d6df..653ebec68deff862287e0d53b637b14aad15001c 100644
--- a/nss/lib/nss/nssver.c
+++ b/nss/lib/nss/nssver.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_base_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__ " $";
-const char __nss_base_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING
-        "  " __DATE__ " " __TIME__;
+const char __nss_base_version[] = "Version: NSS " NSS_VERSION _DEBUG_STRING;