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

Change-Id: I94b3dfd67d4d8a94f79dbd4f4806f6729ca359a0