Merge "Support gdbclient.py on riscv64" am: f87641a7ea am: 3b2b1aa115

Original change: https://android-review.googlesource.com/c/platform/development/+/2626617

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