Merge remote-tracking branch 'slim/kk4.4' into ose

Conflicts:
	config/common.mk
	prebuilt/common/app/NovaLauncher.apk