Merge "Add riscv64 support"