Merge "Relax host init parser to work with the build system"
am: 4632f4e868

Change-Id: I583443a7e546b7b32454b7cf5ef2e60f3b73cc09