Revert "Navigation bar custom height"

This reverts commit 8e92281586d2f8e99c02329fc48e41ca7794de5e.

Conflicts:
	res/xml/display_settings.xml
	res/xml/navigation_bar_settings.xml
	src/com/android/settings/simpleaosp/NavigationBarSettings.java