Hybrid toggle

Change-Id: I5bdab2c3671c09ea0ba0b043f2c247ea3c02652a
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_frameworks_base into jellybean