Add mako to the mix

Change-Id: Ie5a7a6ef7f87bab8a9ddb0d17772ca7457f955f4
Add shamu

Conflicts:
	vendorsetup.sh

Change-Id: I640b5907cdfc0987a2a8f680ed197c85be6f60d0
Merge remote-tracking branch 'upstream/lollipop' into lollipop

Conflicts:
	vendorsetup.sh