Cleanup

Working, tested :)

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