Unify jf/d2

Change-Id: I979eab591cbb6ca586e3abe5050865c5bef11ebd
Merge remote-tracking branch 'upstream/kk4.4' into berserk

Conflicts:
	vendorsetup.sh