Remove upstreamed patches. Added patch to fix compilation. Signed-off-by: Rosen Penev <rosenp@gmail.com>