diff --git a/arm/Android.mk b/arm/Android.mk
index c7e9ae8..582c7c3 100644
--- a/arm/Android.mk
+++ b/arm/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),)
+ifneq ($(TARGET_DEVICE),)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := PrebuiltGmsCore
diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk
index 85725df..a5904af 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -20,3 +20,5 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore \
     SetupWizard
+
+$(call inherit-product, vendor/gapps/common/common-vendor.mk)
diff --git a/common/Android.mk b/common/Android.mk
index d88f3f2..8dc6953 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),)
+ifneq ($(TARGET_DEVICE),)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleContactsSyncAdapter