Use new hybrid engine methods
Merge branch 'hybrid2' of git://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean