Merge pull request #9838 from alalek:fix_ocl_world_build