[test] Simplify some sh4 patches