Variant fixes + removed + from setlocalversion

Conflicts:
	scripts/setlocalversion
VS980,D802 - Use variant specific sources to attempt to fix reboot and sod issues (Part 2)

Signed-off-by: dr87 <nb00870@gmail.com>