Merge "riscv64: fix debuggerd_test build." am: 3b1e71c6 am: 8c27dc6b am: 97f766c9

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



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