Add shamu

Conflicts:
	vendorsetup.sh

Change-Id: I640b5907cdfc0987a2a8f680ed197c85be6f60d0