Untested update of Lima font renderer.
Fix CXX_BUILD.
Merge branch 'master' into font-rewrite
Small CXX_BUILD fix.