Fix x86_64 target build

Bug: http://b/21471495
Bug: https://bugs.kde.org/id=348342
Change-Id: I5b48491d18ced37c9ecff60661fb4a5b47519219
(cherry picked from commit 22bcca76a224404fa81fff26437d15f17be56fd4)
diff --git a/coregrind/m_initimg/initimg-linux.c b/coregrind/m_initimg/initimg-linux.c
index d8ff159..140eb78 100644
--- a/coregrind/m_initimg/initimg-linux.c
+++ b/coregrind/m_initimg/initimg-linux.c
@@ -646,10 +646,7 @@
          case AT_GID:
          case AT_EGID:
          case AT_CLKTCK:
-#        if !defined(VGPV_arm_linux_android) \
-            && !defined(VGPV_x86_linux_android) \
-            && !defined(VGPV_mips32_linux_android) \
-            && !defined(VGPV_arm64_linux_android)
+#        if !defined(__ANDROID__)
          case AT_FPUCW: /* missing on android */
 #        endif
             /* All these are pointerless, so we don't need to do
diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
index fbb2e28..dec2ac5 100644
--- a/coregrind/vg_preloaded.c
+++ b/coregrind/vg_preloaded.c
@@ -57,10 +57,7 @@
 void VG_NOTIFY_ON_LOAD(freeres)( void )
 {
 #  if !defined(__UCLIBC__) \
-      && !defined(VGPV_arm_linux_android) \
-      && !defined(VGPV_x86_linux_android) \
-      && !defined(VGPV_mips32_linux_android) \
-      && !defined(VGPV_arm64_linux_android)
+      && !defined(__ANDROID__)
    extern void __libc_freeres(void);
    __libc_freeres();
 #  endif
diff --git a/coregrind/vgdb.c b/coregrind/vgdb.c
index 9057e46..bcfb6c3 100644
--- a/coregrind/vgdb.c
+++ b/coregrind/vgdb.c
@@ -687,10 +687,7 @@
       sigpipe++;
    } else if (signum == SIGALRM) {
       sigalrm++;
-#if defined(VGPV_arm_linux_android) \
-    || defined(VGPV_x86_linux_android) \
-    || defined(VGPV_mips32_linux_android) \
-    || defined(VGPV_arm64_linux_android)
+#if defined(__ANDROID__)
       /* Android has no pthread_cancel. As it also does not have
          an invoker implementation, there is no need for cleanup action.
          So, we just do nothing. */