Tweaks to get libcairo compiling on iOS and OS X.
Merge branch 'release-6.6.4' into develop