7096016: SA build still produces "arg list too long" errors

Reviewed-by: kvn, never
4 files changed