Switch over to moto unified builds

Change-Id: I50557828b4b6bd1a8efc65ab10dd93c7e06d826a

Conflicts:

	vendorsetup.sh