Break up our 'sudo' commands into separate args.

This makes 'sudo' happier.

Change-Id: Iaead542d633eda99d94d43facb02a25fc857d549