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

Merge "riscv64: fix debuggerd_test build." am: 3b1e71c6 am: 8c27dc6b am: 97f766c9 am: 319af5e1 am: 23aa78d9

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



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