Merge pull request #311786 from josephst/clblas-stdlib