Bug 926710 - Fix up non-threadsafe builds rs=trivial,blocking-fuzzer