Merged r15666 into trunk branch.

src/platform-posix.h

Index: src/platform-posix.h
diff --git a/src/platform-posix.h b/src/platform-posix.h
index 79178fd9a7f0e1d3bf8a2c869c30a6e8b750496c..bcc2b7e74e4263430d7438b0b7d555fc0107da80 100644
--- a/src/platform-posix.h
+++ b/src/platform-posix.h
@@ -28,7 +28,9 @@
 #ifndef V8_PLATFORM_POSIX_H_
 #define V8_PLATFORM_POSIX_H_
 
+#if !defined(ANDROID)
 #include <cxxabi.h>
+#endif
 #include <stdio.h>
 
 #include "platform.h"
@@ -58,10 +60,12 @@ struct POSIXBacktraceHelper {
         fprintf(stderr, "%2d: ", i);
         char mangled[201];
         if (sscanf(symbols[i], "%*[^(]%*[(]%200[^)+]", mangled) == 1) {// NOLINT
+          char* demangled = NULL;
+#if !defined(ANDROID)
           int status;
           size_t length;
-          char* demangled = abi::__cxa_demangle(
-              mangled, NULL, &length, &status);
+          demangled = abi::__cxa_demangle(mangled, NULL, &length, &status);
+#endif
           fprintf(stderr, "%s\n", demangled != NULL ? demangled : mangled);
           free(demangled);
         } else {