Bug 1049694: Remove unused mozilla::CharTokenizer. r=froydnj
Bug 1050509: Shut down the KeyStore socket during system shutdown to avoid leaks. r=tdz