Merge "Add riscv binary recognition in gdb script" am: 9a0d8d75f0 am: afa1f3d2c4 am: ea5815ae8c

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

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