Merge recent sxc fixes to sxc-opencl.