Unify jf/d2

Change-Id: I979eab591cbb6ca586e3abe5050865c5bef11ebd
Bump to 4.2 for weekly

Change-Id: I5764a473a6e54e9c11cf630e7c35d9a493d472ff
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Vendor: add multicarrier for unifyed devices

thanks CM

Change-Id: Ib2c84a21f9fbb6dc24edae2409dd0e8408619392
Merge "Bump to 4.2 for weekly" into kk4.4
push version for weekly

Change-Id: Ifea32ba54f27bef829544414eb4a45d7fa78b23f
Merge remote-tracking branch 'upstream/kk4.4' into kk44s

Conflicts:
	vendorsetup.sh