Merge branch 'kk4.4' of https://github.com/SlimRoms/frameworks_base into kk4.4

Conflicts:
	packages/SystemUI/res/values/styles.xml

Change-Id: I81d80aa74ad98ad25850e332c93cc2c836d0132c