Merge "init: clean up host_init_stubs a bit"
am: 52f617176e

Change-Id: Ia8e9f51a7befe01bdd8878899be8f3ea17ab2868