etc: Fix test combiner for core->std/std->extra change. rs=burningtree
libextra: Add missing core::prelude import. rs=burningtree