Port framework changes from master

Now requiring the headers to be configured for OpenCL > 2.1.

test_conformance/images/clFillImage/test_fill_2D_array.cpp

@@ -1,6 +1,6 @@
 //
 // Copyright (c) 2017 The Khronos Group Inc.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at