This is to avoid problems with too long command lines on Windows.

Change-Id: Ifc99bedd37aea7619e002145d4acbb7ec2a14246