NSS/NSPR fixes for Windows/amd64.Patch by: me(cherry picked from commit 9bbb3c7f6b2903f7ff32e88096e41ed5dc704e35)