Halo: Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_frameworks_base into jb43

Change-Id: I3417b2d1340d514c7685ec6d2ab48b4d43e6d64e