* config/s390/s390.md ("movstr_short_64", "movstr_short_31"): Merge ...