Merge pull request #4083 from harfbuzz/bump-cairo

build: Bump to newer cairo