Fix NPE

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

Conflicts:
	cmds/servicemanager/Android.mk
	cmds/servicemanager/service_manager.c
	core/res/res/values/config.xml
	core/res/res/values/public.xml
	core/res/res/values/symbols.xml
	media/java/android/media/AudioService.java
	packages/SystemUI/res/drawable-nodpi/bubble_black_l.9.png
	packages/SystemUI/res/drawable-nodpi/bubble_black_r.9.png
	packages/SystemUI/res/layout/halo_speech.xml
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/NotificationManagerService.java
	telephony/java/android/telephony/SignalStrength.java
	telephony/java/com/android/internal/telephony/RILConstants.java
	wifi/java/android/net/wifi/WifiNative.java
	wifi/java/android/net/wifi/WifiStateMachine.java

Change-Id: If58ffa0b7b1108e3b4fede6756c6378605fcc658