Navigation Bar height

Based on simple aosp's, removed there extra file (click) and just added
it to the main display setting

Conflicts:
	res/values/liquid_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Change-Id: I31bc6bbdb3a3e5432e567fa7bc165bfe68ec4635