Update to conform with cf4ocl commit 7fa8813
"Refactor image and buffer enqueue functions"