Enable RPC builds and merge PR 15405 across Dockerfiles

toolboxes/Dockerfile.rocm-6.4.2-rocwmma

@@ -20,13 +20,18 @@ RUN git clone --recursive https://github.com/ggerganov/llama.cpp.git .
 
 # build + install
 RUN git clean -xdf \
+ && git config user.email "builder@localhost" \
+ && git config user.name "Container Builder" \
  && git pull \
+ && git fetch origin pull/15405/head:pr-15405 \
+ && git merge --no-edit pr-15405 \
  && git submodule update --recursive \
  && HIPCXX="$(hipconfig -l)/clang" HIP_PATH="$(hipconfig -R)" \
     cmake -S . -B build \
       -DGGML_HIP=ON \
       -DAMDGPU_TARGETS=gfx1151 \
       -DCMAKE_BUILD_TYPE=Release \
+      -DGGML_RPC=ON \
       -DLLAMA_HIP_UMA=ON \
       -DGGML_HIP_ROCWMMA_FATTN=ON \
  && cmake --build build --config Release -- -j$(nproc) \