JWR bits and pieces

Change-Id: I233f574839b523e95e1509c2cab68a829bf76410
Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_frameworks_base into jb-mr2