More fixes

Change-Id: I445d619cbdfcf840984b2f55e807344481c32d8f
Merge branch 'jb43' of git://github.com/ParanoidAndroid/android_frameworks_base into jb43

Conflicts:
	services/java/com/android/server/NotificationManagerService.java

Change-Id: I45396a24eb6d83fa87427885f039afdc7455d13b