Switch to new Superuser

Change-Id: I9d91392ad6fbc9953d19059ab59b91d214c00e0c
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_packages_apps_Settings into cm-10.1