Some Zips env changes
PRODUCT_NAME Change
Merge branch 'jb-mr1' of https://github.com/Zipsnet/vendor_aokp into jb-mr1

Conflicts:
	build.sh
	products/AndroidProducts.mk
	products/ville.mk
	vendorsetup.sh