Merge "Pull in the riscv64 uapi headers for riscv64 builds."