Merge "riscv64: fix debuggerd_test build."