[bug#60538] [PATCH] rm: convert more cases to am__rm_f

[Karl Berry]

    Fixes automake bug https://bugs.gnu.org/10828.

Hi Mike - this change looks good to me. Good catches finding these.
Please commit. --thanks, karl.