Merge remote-tracking branch 'origin/kk4.4' into Oppo

Conflicts:
	config/common.mk
Build Update