Merge remote-tracking branch 'caf/kk_2.7-stable' into cm-11.0
shooter:  Fix up audio a little more

This takes care of the issue in call audio cutting out
Merge remote-tracking branch 'msm8960/cm-11.0' into rebase