Revert "fb: Slims navbar and navring customizations"

This reverts commit 7a1f3f3090ee27452e71425e177bab0369e0cc98.

Conflicts:
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	packages/SystemUI/res/values/cr_colors.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java