Revert "Merge 20121118"

This reverts commit 8f4d31bc6e976df6984a5eb891d88de731391b63.

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java