Merge "Add tomstone proto support for riscv64"