Disable locklock and VoicePlus
Merge remote-tracking branch 'mb52x/cm-11.0' into cm11.0-mb52x