Index: metadata/icall-def.h
===================================================================
--- metadata/icall-def.h	(revision 126409)
+++ metadata/icall-def.h	(working copy)
@@ -36,6 +36,7 @@
  * Remember to change also the first_icall_id argument in the ICALL_TYPE 
  * declaration if you add a new icall at the beginning of a type's icall list.
  */
+
 ICALL_TYPE(UNORM, "Mono.Globalization.Unicode.Normalization", UNORM_1)
 ICALL(UNORM_1, "load_normalization_resource", load_normalization_resource)
 
@@ -55,6 +56,13 @@
 ICALL(KPAIR_5, "_ProtectUser", ves_icall_Mono_Security_Cryptography_KeyPairPersistence_ProtectUser)
 #endif /* !PLATFORM_RO_FS */
 
+#ifdef PLATFORM_ANDROID
+ICALL_TYPE(ANDROID, "MonoDalvikBridge.DalvikBridge", ANDROID_1)
+ICALL(ANDROID_1, "InvokeInternal", ves_icall_DalvikBridge_InvokeInternal)
+ICALL(ANDROID_2, "Log", ves_icall_DalvikBridge_Log)
+ICALL(ANDROID_3, "SetMonoHooks", ves_icall_DalvikBridge_SetMonoHooks)
+#endif
+
 ICALL_TYPE(ACTIV, "System.Activator", ACTIV_1)
 ICALL(ACTIV_1, "CreateInstanceInternal", ves_icall_System_Activator_CreateInstanceInternal)
 
@@ -935,4 +943,3 @@
 ICALL(COMOBJ_1, "CreateRCW", ves_icall_System_ComObject_CreateRCW)
 ICALL(COMOBJ_2, "GetInterfaceInternal", ves_icall_System_ComObject_GetInterfaceInternal)
 ICALL(COMOBJ_3, "ReleaseInterfaces", ves_icall_System_ComObject_ReleaseInterfaces)
-
Index: metadata/icall.c
===================================================================
--- metadata/icall.c	(revision 126409)
+++ metadata/icall.c	(working copy)
@@ -27,6 +27,9 @@
 #if defined (PLATFORM_WIN32)
 #include <stdlib.h>
 #endif
+#if defined (PLATFORM_ANDROID)
+#include <androidicall.h>
+#endif
 
 #include "mono/utils/mono-membar.h"
 #include <mono/metadata/object.h>
Index: metadata/socket-io.c
===================================================================
--- metadata/socket-io.c	(revision 126409)
+++ metadata/socket-io.c	(working copy)
@@ -2387,7 +2387,7 @@
 			/* If requesting "" and there are no other interfaces up, MS returns 127.0.0.1 */
 			*h_addr_list = mono_array_new(domain, mono_get_string_class (), 1);
 			mono_array_setref (*h_addr_list, 0, mono_string_new (domain, "127.0.0.1"));
-			n_local_in = 1;
+			nlocal_in = 1;
 			return TRUE;
 		}
 	}