Revert "msm: bam_dmux: Fixup merge"

This reverts commit d9038eaee7e65252e642c5133e2e80c081467a2d.
Misc source updates

Change-Id: Ie17c7a2244a4d6693041e582e280dc7740f3f6cb
msm: Fixup Kconfig

Change-Id: If53b03fcb167c8fadeaa5f7e1172e7a146c9afd0
Update defconfigs

Change-Id: I52a4430bc93917d2515bac3ca5d212480b6142ab
Merge branch 'cm-11.0' into kk_mkt