Re-add vigor

Conflicts:
	products/AndroidProducts.mk