pw_rpc: Merge pw_rpc protos into the pw_rpc package

This merges the pw_rpc_protos pw_proto_library Python package into
pw_rpc.

Requires: pigweed-internal:10840
Change-Id: Ib510571d75281d29d2a6719950b33ec09d0a5b9d
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/36505
Commit-Queue: Wyatt Hepler <hepler@google.com>
Reviewed-by: Joe Ethier <jethier@google.com>
Reviewed-by: Alexei Frolov <frolv@google.com>
diff --git a/pw_rpc/BUILD.gn b/pw_rpc/BUILD.gn
index 0424f1e..3a5a79f 100644
--- a/pw_rpc/BUILD.gn
+++ b/pw_rpc/BUILD.gn
@@ -138,7 +138,8 @@
     "internal/packet.proto",
   ]
   inputs = [ "echo.options" ]
-  prefix = "pw_rpc_protos"
+  python_package = "py"
+  prefix = "pw_rpc"
 }
 
 pw_doc_group("docs") {
@@ -217,7 +218,8 @@
 
 pw_python_action("generate_ids_test") {
   outputs = [ "$target_gen_dir/generated_ids_test.cc" ]
-  script = "py/ids_test.py"
+
+  script = "py/tests/ids_test.py"
   args = [ "--generate-cc-test" ] + rebase_path(outputs)
   python_deps = [
     "$dir_pw_build/py",