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

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



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