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

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



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