Unbreak Cygwin patch handling

Change-Id: I7f0215f4799546e481423d6f4ab5d583bf083948