MSM: Fixup kconfig and makefile