gapps: Fix missing sed

* And regenerate makefiles

common/Android.mk

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

setup-makefiles.sh

@@ -45,6 +45,8 @@ write_headers "arm arm64 x86"
 # Common gapps
 write_makefiles "$MY_DIR"/proprietary-files-common.txt
 
+sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
+
 # We are done with common
 write_footers