Fix uneven spacing of navigation bar buttons

* For AOSP this time :)

Change-Id: I880acdb2215c2aefac6282e5b293def9f3041c75