Merge "Apply riscv64 workarounds."