- Code formatting
- Use ShellQuote for one argument
- Remove variables no longer used after commit 9294514d



Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>