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

This reverts commit 561f5f0625a7bf53f09ab0b8dd4fea6049179948.