halo, tweaking

Change-Id: I35f8dc19ed5840e186989ec3cfa5529c9d39dd48
Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_frameworks_base into jb43-legacy
Merge remote-tracking branch 'frameworksPA/jb43-legacy' into jb43-legacy