Unbreak Cygwin patch handling

Change-Id: Id7ad1063ae73099b1513fbeb08458298d3c135d8