Fix iOS device builds
Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode

Conflicts:
	engine/engine-mobile.xcodeproj/project.pbxproj
Merge remote-tracking branch 'upstream/refactor-syntax_unicode' into refactor-syntax_unicode