Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_frameworks_base into jellybean-legacy

Change-Id: I5f3bfc80a358a1c3b512b9c70aa27db74b355e0e