Revert "Remove stuff taken care of by MSM init vendor lib"

This reverts commit ab6c7c4a8482c1ed75e414ba792bcc6cdc79ce91.