[upstream] update to tag 2.36.4
[packaging] update submodule packaging for 2.36.4