(2 of x) Bug fixes and build fixes...

Change-Id: I256ab9382889d9ae6d0d91023c695f017b02d609

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java