Fixed workaround made in https://reviews.llvm.org/D51694.

Patch suggested by Kelvin Li: removed optional "kind=" part of kind-selector
for variables with long names and kind names.

Differential Revision: https://reviews.llvm.org/D52712


git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@343475 91177308-0d34-0410-b5e6-96231b3b80d8