snd_soc: fix some disable sequences

Change-Id: I7fd1801ff56133773759d8ee85e3056324be8870
Camera2: Enable 10MP and nHD pictures modes

Change-Id: I69b0e374685757a7abe945a0a45cee7d1a0768ff
Merge "snd_soc: fix some disable sequences" into cm-11.0
Merge branch 'cm-11.0' into martincz