Fix navbar layout

Before: http://owain.nl/before.png
After:  http://owain.nl/after.png

Change-Id: Ie3e3c54a9644d232b1d9b74cbc9fa0eeed072b98

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java