Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/ckfw/builtins/binst.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "builtins.h"
 
 /*
  * builtins/instance.c
  *
  * This file implements the NSSCKMDInstance object for the 
@@ skipping 47 matching lines @@
   return (NSSUTF8 *)nss_builtins_LibraryDescription;
 }
 
 static CK_VERSION
 builtins_mdInstance_GetLibraryVersion
 (
   NSSCKMDInstance *mdInstance,
   NSSCKFWInstance *fwInstance
 )
 {
-  extern const char __nss_builtins_rcsid[];
-  extern const char __nss_builtins_sccsid[];
-  volatile char c; /* force a reference that won't get optimized away */
-
-  c = __nss_builtins_rcsid[0] + __nss_builtins_sccsid[0];
+#define NSS_VERSION_VARIABLE __nss_builtins_version
+#include "verref.h"
   return nss_builtins_LibraryVersion;
 }
 
 static CK_RV
 builtins_mdInstance_GetSlots
 (
   NSSCKMDInstance *mdInstance,
   NSSCKFWInstance *fwInstance,
   NSSCKMDSlot *slots[]
 )
@@ skipping 10 matching lines @@
   builtins_mdInstance_GetNSlots,
   builtins_mdInstance_GetCryptokiVersion,
   builtins_mdInstance_GetManufacturerID,
   builtins_mdInstance_GetLibraryDescription,
   builtins_mdInstance_GetLibraryVersion,
   NULL, /* ModuleHandlesSessionObjects -- defaults to false */
   builtins_mdInstance_GetSlots,
   NULL, /* WaitForSlotEvent */
   (void *)NULL /* null terminator */
 };