Merge remote-tracking branch 'upstream/kk-4.4' into kk-4.4

	modified:   BoardConfig.mk
	modified:   device.mk