Move plugin/srpc contents to the more appropriately named plugin/common....

src/trusted/plugin/npapi/npapi_native.cc

 /*
  * Copyright 2008 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "native_client/src/include/checked_cast.h"
+#include "native_client/src/trusted/plugin/desc_based_handle.h"
 #include "native_client/src/trusted/plugin/npapi/browser_impl_npapi.h"
 #include "native_client/src/trusted/plugin/npapi/npapi_native.h"
 #include "native_client/src/trusted/plugin/npapi/scriptable_impl_npapi.h"
-#include "native_client/src/trusted/plugin/srpc/desc_based_handle.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 using nacl::assert_cast;
 
 #define STRINGZ_TO_NPVARIANT_ASSERT(_val, _v)                   \
   NP_BEGIN_MACRO                                                \
   (_v).type = NPVariantType_String;                             \
   NPString str = { _val, assert_cast<uint32_t>(strlen(_val)) }; \
   (_v).value.stringValue = str;                                 \
   NP_END_MACRO
 
@@ skipping 148 matching lines @@
   NPN_ReleaseVariantValue(&nplength);
   if (!correct_type) {
     return false;
   }
   // Make result available to the caller.
   *length = tmp_length;
   return true;
 }
 
 }  // namespace plugin