AF: Fix display of units.

In Afrikaans we do not put the unit infront of the size ie MB30
should be rather 30MB

Change-Id: I16c1fcf22b3f66a2b14429ff15afa07fcb9e9156
NavigationBar : Customization

Includes:

- Allows user to customize navigation bar.
  Features :
   - Choose from 1-6 # of buttons
   - Re-arrange / assign buttons
  Id: Idc9f5f401f15d207504e49de47666bb5510a06ca

- Navbar : Rework logic for determining orientation
  This patch introduces better checks for hybrid ui's.
  This should fix issues of small buttons due to incorrect ui determination
  Thanks Rolf Arne Schulze for testing :)
  Id: If5b61dc4764a98deedb5b801d11451fed2488cba

- Make navigation bar ready for per-user configuration.
  Also clean it up a bit.
  Id: Ic10bd161fce53bf30048a0cb927dcf1e2bfa7774

- Fix layout on N10
- Remove uncessary padding and logic
- Phone fixes
- Phone padding fixes

Change-Id: I8903b85b6ee8581f8564d9dc7b0d40f645d7647a

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Revert "PhoneWindowManager: Delay setting updates during window animation."

This reverts commit 00295091b558ca8ea17cd5786a08865c57dc6675.

Conflicts:

	core/java/android/view/WindowManagerPolicy.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/wm/WindowAnimator.java

Change-Id: Ice177d099a9865848c9919f3452bb0f1d28ae81a

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Revert "Show advanced reboot if using an insecure lock screen"

This reverts commit 209e975d272740ba1b1c11cd3115c70a36f958be.
Revert "Framework: Show the Advanced reboot menu only for the primary user"

This reverts commit 37245dd5251bd52cf36bc3c404cf5d60e64ec858.
Revert "Framework: Add Advanced reboot (2 of 2)"

This reverts commit 435c6f510c9d74581b44f12c9832fa966b5fc476.

Conflicts:

	core/java/android/provider/Settings.java
	services/java/com/android/server/power/ShutdownThread.java
SystemUI: do not collapse panels if keyevent was canceled.

Change-Id: I9af82e9fa2305142521075938dfd05521adeb9f4