<2GB arm64_ab gapps system

gapps-go.mk

@@ -10,11 +10,11 @@ FILTER_OUT = $(foreach v,$(2),$(if $(findstring $(1),$(v)),,$(v)))
 PRODUCT_COPY_FILES := $(call FILTER_OUT,google_go.xml:, $(PRODUCT_COPY_FILES))
 
 #We need to use this way because it overrides sync adapters
-PRODUCT_PACKAGES := $(call FILTER_OUT,CalendarGoogle, $(PRODUCT_PACKAGES))
-PRODUCT_PACKAGES := $(call FILTER_OUT,GoogleContacts, $(PRODUCT_PACKAGES))
+PRODUCT_PACKAGES := $(filter-out CalendarGoogle, $(PRODUCT_PACKAGES))
+PRODUCT_PACKAGES := $(filter-out GoogleContacts, $(PRODUCT_PACKAGES))
 
 PRODUCT_SHIPPING_API_LEVEL :=
 
 PRODUCT_PACKAGES += \
 	phh-gapps-go-overrides \
-
+	GoogleContactsSyncAdapter \

gapps.mk

@@ -1,11 +1,16 @@
 BUILD_GMS := yes
 ifneq ($(wildcard vendor/google),)
--include vendor/google/products/gms_eea_type1.mk
+-include vendor/google/products/gms.mk
 PRODUCT_SHIPPING_API_LEVEL :=
+
+PRODUCT_PACKAGES := $(filter-out CalendarGoogle, $(PRODUCT_PACKAGES))
+PRODUCT_PACKAGES := $(filter-out GoogleContacts, $(PRODUCT_PACKAGES))
+
 PRODUCT_PACKAGES += \
 	phh-gapps-overrides \
+	Chrome \
+	GoogleContactsSyncAdapter \
 
-FILTER_OUT = $(foreach v,$(2),$(if $(findstring $(1),$(v)),,$(v)))
 endif
 
 ifneq ($(wildcard vendor/opengapps),)

overrides/Android.mk

@@ -29,7 +29,7 @@ PACKAGES.$(LOCAL_MODULE).OVERRIDES := \
 	Photos \
 	Maps \
 	Gmail2 \
-	GoogleContacts \
+	Velvet \
 	GmsSampleIntegration \
 	GmsSampleIntegrationGo \
 	GmsSampleIntegrationGo2GB \