Revert "Navigation bar custom height"

This reverts commit 36e5064a9d1f9353568d0ee2811bafee7b2ce74d.

Conflicts:
	core/java/android/provider/Settings.java