Cleanup, move gapps to vendor_gapps, added variable to control adding of apps in vendor_gapps

Change-Id: Ie442cb3fa557167f56c0352062cd340fe091bdf7