Unbreak the building of the CEF stuff. Mostly.
Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode