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

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

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

python-packages/gdbrunner/__init__.py

@@ -341,6 +341,9 @@ def get_binary_arch(binary_file):
     elif e_machine == 0x3E:
         assert ei_class == 2
         return "x86_64"
+    elif e_machine == 0xF3:
+        assert ei_class == 2
+        return "riscv64"
     else:
         raise RuntimeError("unknown architecture: 0x{:x}".format(e_machine))