Fix makefiles

Change-Id: Ice1b66046a1c8525b91012540907bdfd4b81c5ab
Signed-off-by: Paul Keith <[email protected]>

arm/Android.mk

@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),)
+ifneq ($(TARGET_DEVICE),)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := PrebuiltGmsCore

arm/arm-vendor.mk

@@ -20,3 +20,5 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore \
     SetupWizard
+
+$(call inherit-product, vendor/gapps/common/common-vendor.mk)

common/Android.mk

@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),)
+ifneq ($(TARGET_DEVICE),)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleContactsSyncAdapter