Port framework changes from master

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

test_conformance/spir/main.cpp

@@ -349,7 +349,6 @@ bool test_suite(cl_device_id device, cl_uint size_t_width, const char *folder,
         std::cout << std::endl;
         return false;
     }
-
     std::cout << std::endl;
     return true;
 }