Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

PS: THIS MERGE REMOVE THIS COMMIT: CyanogenMod/android_frameworks_base@36672e7
    crDroid already have this for a long time ago

Conflicts:
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/IconMerger.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java

Change-Id: I3e69d84faa978115ba59b57f8c8f567d16cfe3d4