Pull PSM/NSS by default now that we no longer have the Makefile.in<->Makefile conflict on checkout due to psm2 landing. This brings us to parity with win32 & mac which already pull these by default.

Bug #77124 r=bryner

client.mk

@@ -314,12 +314,6 @@ endif
 ifeq (,$(filter modules/libpr0n, $(BUILD_MODULE_CVS)))
   CVSCO_IMGLIB2 :=
 endif
-else
-ifndef MOZ_NSS_AUTOCONF
-  # Do not pull PSM/NSS by default
-  CVSCO_PSM :=
-  CVSCO_NSS :=
-endif
 endif
 
 ####################################