apr-util: clean up Makefile and remove patch