Merge "init: clean up host_init_stubs a bit"