Fold hyphen-c99.patch.0 into hyphen-fdo48017-wfopen.patch

Change-Id: I2f866aa16704bc5492e0e0b78136fdfe41caa7a5