readd VoicePlus

Change-Id: I3a07542ff8d377044058651c0244052f43708141
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android into cm-11.0