MFC r163999
Sync up with rhyolite routed 2.31 which fixes the handling of varargs.
Remove -p from usage, it's gone completely now.

Merge to 7 not applicable, 7 obtained this change when it was
branched.

PR: 82287
Submitted by: arved