push to 6.3

Change-Id: I1618dfc27236ae971ea47e066204bea4cdc95e31
Merge branch 'upstream/kk4.4'

Conflicts:
	config/common.mk