Merge "riscv64: remove some obsolete #if cruft." into main