Merge "riscv64: fix debuggerd_test build." am: 3b1e71c63b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2498756

Change-Id: I7d2e1a968810b1dcbb3d3c25cec703c3cd69208c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>