Merge "Fix ABI string processing for deqp in CTS"
am: 928b21e640  -s ours

* commit '928b21e6407fe9fbfe0f6b6cc076fa3cb083b861':
  Fix ABI string processing for deqp in CTS