Merge "Add ABI_STRING definition for riscv64"