Bug 579517 follow-up: Remove NSPR types that crept in
bug 872605 add ability to update provider manifest, r=markh