Merge "libinit_test_utils: don't assume interface format"