Snap for 4413317 from 8a3abefd to pi-release

Change-Id: Ide1fe14372702a9618c87256d9913437ab12c0b8

Android.mk

@@ -126,7 +126,7 @@ LOCAL_MODULE := libssh
 LOCAL_CFLAGS+=-O3 -Wno-unused-parameter
 
 LOCAL_CFLAGS += -DGCE_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
-ifneq ($(filter gce_x86 calypso, $(TARGET_DEVICE)),)
+ifneq ($(filter gce_x86 gce_x86_64 calypso, $(TARGET_DEVICE)),)
 LOCAL_CFLAGS += -DANDROID_GCE -DSSHDIR=\"/var/run/ssh\"
 endif
 
@@ -258,7 +258,7 @@ LOCAL_SRC_FILES := \
 LOCAL_MODULE := sshd
 
 LOCAL_CFLAGS += -Wno-unused-parameter
-ifneq ($(filter gce_x86 calypso, $(TARGET_DEVICE)),)
+ifneq ($(filter gce_x86 gce_x86_64 calypso, $(TARGET_DEVICE)),)
 LOCAL_CFLAGS += -DANDROID_GCE $(GCE_VERSION_CFLAGS)
 endif