Remove upstreamed patches. Add one to fix finding libwebp. Signed-off-by: Rosen Penev <rosenp@gmail.com>