build fixes
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	modified:   policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
hopefully fix the build
Merge remote-tracking branch 'upstream/kitkat' into kitkat

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java