rename vs840
Merge remote-tracking branch 'remotes/1/master'

Conflicts:
	AndroidBoard.mk
	AndroidProducts.mk
	BoardConfig.mk
	cm.mk
	device_vs840.mk
	system.prop
	vendorsetup.sh