Remove files that were accidentally included in the previous merge (pull request #1802). The obsolete patches are breaking the build now. Signed-off-by: Miroslav Lichvar <mlichvar0@gmail.com>