Revert "Navigation bar custom height"

This reverts commit e967342fe49b9202d5ab3a6cf8bfaf397b7a7225.

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