RPC: Merge RPC PSA Client APIs

Originally, connection-based APIs are optional, depends on whether the
TF-M provides any.
So the RPC APIs are also separated so that they can be selected.

Later, the APIs are always provided with returning NOT SUPPORTED in case
of no connection-based APIs.
And the RPC test framework followed up by always building all the APIs.

This patch makes it further by merging all the APIs.

Change-Id: I923c24e5e83cae4e3d8f4774d776dbe8d07610c2
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/erpc/server/erpc_server_start.c b/erpc/server/erpc_server_start.c
index 4d27876..ca3b6e9 100644
--- a/erpc/server/erpc_server_start.c
+++ b/erpc/server/erpc_server_start.c
@@ -9,14 +9,12 @@
 
 #include "erpc_mbf_setup.h"
 #include "erpc_server_setup.h"
-#include "tfm_erpc_psa_client_api_server.h"
-#include "tfm_erpc_psa_connection_api_server.h"
+#include "tfm_erpc_server.h"
 
 void erpc_server_start(erpc_transport_t transport)
 {
     erpc_server_init(transport, erpc_mbf_dynamic_init());
     erpc_add_service_to_server(create_psa_client_api_service());
-    erpc_add_service_to_server(create_psa_connection_api_service());
 
     erpc_server_run();