msm8660: add QCOM_VOIP_ENABLED back

Change-Id: I53f2ff6b248ab8712bc9948f862a98cd8bcf951e
Merge branch 'cm-10.1' into martincz