Update to 2.36.0

- updated -makefile.patch and removed applied upstream -am.patch