Restructure the structs/unions involved in SRPC argument passing. This will...

tests/srpc/srpc_nrd_client.c

Index: tests/srpc/srpc_nrd_client.c
===================================================================
--- tests/srpc/srpc_nrd_client.c	(revision 3898)
+++ tests/srpc/srpc_nrd_client.c	(working copy)
@@ -127,7 +127,7 @@
   /* Return the imc descriptor, the string we wrote, and the error count. */
   out_args[0]->u.hval = desc;
   /* NOTE: string return values from SRPC need to be heap allocated. */
-  out_args[1]->u.sval.str = strdup(test_string);
+  out_args[1]->arrays.str = strdup(test_string);
   out_args[2]->u.ival = errors_seen;
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);