Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c

Index: nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c
diff --git a/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c b/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c
index 6bc74b611291b8570e52c8892296f6f4c4e02d00..338eb1c017e9ac293ee3d709451cf529e6ae36a3 100755
--- a/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c
+++ b/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_lifecycle.c
@@ -73,7 +73,7 @@ pkix_pl_lifecycle_ObjectTableUpdate(int *objCountTable)
 PKIX_UInt32
 pkix_pl_lifecycle_ObjectLeakCheck(int *initObjCountTable)
 {
-        int   typeCounter = 0;
+        unsigned int typeCounter = 0;
         PKIX_UInt32 numObjects = 0;
         char  classNameBuff[128];
         char *className = NULL;
@@ -245,7 +245,9 @@ cleanup:
 PKIX_Error *
 PKIX_PL_Shutdown(void *plContext)
 {
+#ifdef DEBUG
         PKIX_UInt32 numLeakedObjects = 0;
+#endif
 
         PKIX_ENTER(OBJECT, "PKIX_PL_Shutdown");
 
@@ -258,10 +260,14 @@ PKIX_PL_Shutdown(void *plContext)
 
         pkix_pl_HttpCertStore_Shutdown(plContext);
 
+#ifdef DEBUG
         numLeakedObjects = pkix_pl_lifecycle_ObjectLeakCheck(NULL);
         if (PR_GetEnv("NSS_STRICT_SHUTDOWN")) {
            PORT_Assert(numLeakedObjects == 0);
         }
+#else
+        pkix_pl_lifecycle_ObjectLeakCheck(NULL);
+#endif
 
         if (plContext != NULL) {
                 PKIX_PL_NssContext_Destroy(plContext);