Exception work clean up.

Change-Id: Ide71ba25ea70b39651f80d9ff469019898a929e6
diff --git a/src/runtime_support.h b/src/runtime_support.h
index 4915314..1f8da91 100644
--- a/src/runtime_support.h
+++ b/src/runtime_support.h
@@ -3,13 +3,15 @@
 #ifndef ART_SRC_RUNTIME_SUPPORT_H_
 #define ART_SRC_RUNTIME_SUPPORT_H_
 
+/* Helper for both JNI and regular compiled code */
+extern "C" void art_deliver_exception(void*);
+
 #if defined(__arm__)
   /* Compiler helpers */
   extern "C" uint64_t art_shl_long(uint64_t, uint32_t);
   extern "C" uint64_t art_shr_long(uint64_t, uint32_t);
   extern "C" uint64_t art_ushr_long(uint64_t, uint32_t);
   extern "C" void art_invoke_interface_trampoline(void*, void*, void*, void*);
-  extern "C" void art_deliver_exception(void*);
 
   /* Conversions */
   extern "C" float __aeabi_i2f(int op1);             // OP_INT_TO_FLOAT
@@ -45,8 +47,4 @@
 
 #endif
 
-#if defined(__i386__)
-extern "C" void art_deliver_exception(void*);
-#endif
-
 #endif  // ART_SRC_RUNTIME_SUPPORT_H_