Clean up navigation bar height & fix it

Change-Id: I03e6edf14014f8293bd82f6f313454ce4cd56139

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java