Update NSS to 3.21 RTM and NSPR to 4.11 RTM

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

Index: nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c
diff --git a/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c b/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c
index 881a1ed54337ee23620d1b7c29dfc25b48567ca6..7dafa0b20434be34e151efd82a1e4f3caa38bf8d 100755
--- a/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c
+++ b/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_object.c
@@ -371,7 +371,7 @@ pkix_pl_Object_Hashcode_Default(
         PKIX_ENTER(OBJECT, "pkix_pl_Object_Hashcode_Default");
         PKIX_NULLCHECK_TWO(object, pValue);
 
-        *pValue = (PKIX_UInt32)object;
+        *pValue = (PKIX_UInt32)((char *)object - (char *)NULL);
 
         PKIX_RETURN(OBJECT);
 }
@@ -600,7 +600,7 @@ PKIX_PL_Object_Alloc(
         object = NULL;
 
         /* Atomically increment object counter */
-        PR_ATOMIC_INCREMENT(&ctEntry->objCounter);
+        PR_ATOMIC_INCREMENT((PRInt32*)&ctEntry->objCounter);
 
 cleanup:
 
@@ -897,7 +897,7 @@ PKIX_PL_Object_DecRef(
             }
             
             /* Atomically decrement object counter */
-            PR_ATOMIC_DECREMENT(&ctEntry->objCounter);
+            PR_ATOMIC_DECREMENT((PRInt32*)&ctEntry->objCounter);
             
             /* pkix_pl_Object_Destroy assumes the lock is held */
             /* It will call unlock and destroy the object */