Split the PNaCl IRT shim into 3 pieces, and include one piece into IRT.

ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c

Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c
index 4c93c9e5e832f11f90640dc898753d0b27c89422..561b0cc391f69e4d2df39b252c75d33db9af95b7 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/shim_entry.c
@@ -28,15 +28,15 @@ void _pnacl_wrapper_start(uint32_t *info) {
 
   if (entry != NULL) {
     /*
-     * Save the real irt interface.
+     * Save the real irt interface query function.
      */
-    __pnacl_real_irt_interface = (TYPE_nacl_irt_query) entry->a_un.a_val;
+    __pnacl_real_irt_query_func = (TYPE_nacl_irt_query) entry->a_un.a_val;
 
     /*
      * Overwrite the auxv slot with the pnacl IRT shim query function.
      */
     entry->a_type = AT_SYSINFO;
-    entry->a_un.a_val = (uintptr_t) __pnacl_irt_interface_wrapper;
+    entry->a_un.a_val = (uintptr_t) __pnacl_wrap_irt_query_func;
   }
 
   /* If entry is NULL still allow startup to continue.  It may be the case