Revert "Stuff for navbar"

This reverts commit 825326813c862cbe56ac4da988ba7d9bb0e1f271.

Conflicts:
	res/xml/display_settings.xml~
	src/com/android/settings/DisplaySettings.java~
Revert "navbar height (2/2)"

This reverts commit 41ea054238608f87487082d81a8c07053ecb85f4.

Conflicts:
	res/values/arrays.xml
	res/values/arrays.xml~
	res/values/strings.xml~
Navbar height (2/2)