A few tweaks for building ASanRT against Android NDK.

llvm-svn: 162666
diff --git a/compiler-rt/lib/asan/asan_malloc_linux.cc b/compiler-rt/lib/asan/asan_malloc_linux.cc
index 1fe848d..005e37d 100644
--- a/compiler-rt/lib/asan/asan_malloc_linux.cc
+++ b/compiler-rt/lib/asan/asan_malloc_linux.cc
@@ -20,7 +20,7 @@
 #include "asan_internal.h"
 #include "asan_stack.h"
 
-#ifdef ANDROID
+#if ASAN_ANDROID
 DECLARE_REAL_AND_INTERCEPTOR(void*, malloc, uptr size);
 DECLARE_REAL_AND_INTERCEPTOR(void, free, void *ptr);
 DECLARE_REAL_AND_INTERCEPTOR(void*, calloc, uptr nmemb, uptr size);