fix systemui compile
Revert "[WIP] Hybrid3"

This reverts commit ba1c4fcf7fb318931aef164bb254fb5a7d06ed43.

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java