Bug 844784: Update NSPR to NSPR_4_10_4_BETA4. Also includes the changes
for bug 972125, bug 963033, bug 767759, bug 971152, bug 936320, and
bug 969061.
Automatic merge