ocl: code cleanup, fix .clb files
Merge pull request #1595 from alalek:cl_code_cleanup