Fix makefile guarding (for real)

* previously definitions for different arches would conflict

Signed-off-by: Paul Keith <javelinanddart@bestas.gr>

common/Android.mk

@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(TARGET_DEVICE),)
+ifneq ($(filter arm arm64 x86,$(TARGET_ARCH)),)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleContactsSyncAdapter