Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.053 on remote branch

Change-Id: Ic7a332335eedc189d466c8466b30c5cf6c2ace13
Merge "Merge AU_LINUX_ANDROID_KK_2.7_RB1.04.04.02.007.053 on remote branch"
ASoC: wcd9304: add a micbias tweak for m4

This gets rid of the dreadful mic noise and makes it usable again.
Taken from the modified m4 driver.

Change-Id: I917e6cadb02efff0271beebd913914b3e4fc59f7
Revert "ASoC: wcd9304: Use M4 wcd9304 variant"

This reverts commit b031d1b1cf6e4c67bb3a8028c04b3a2b3fc4235f.

Conflicts:
	sound/soc/codecs/wcd9304_m4.c

Change-Id: Ia85fc6cc2d891171ea6d1eaf02c81f00ba81f078
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge remote-tracking branch 'caf/kk_2.7_rb1.33' into cm-11.0
Merge remote-tracking branch 'msm8960/cm-11.0' into rebase