Merge "Add riscv64 to the list of uapi architectures."