Removed upstreamed patches. Refreshed other ones. Removed Makefile hacks. Signed-off-by: Rosen Penev <rosenp@gmail.com>