Merge "riscv64: say "x3" rather than "gp" in shadow call stack assembler." am: ad333b6161 am: 7e6e6d64ee

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2592806

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