Fix some logic where we used to have char arrays, but we now use std::string....

Fix some logic where we used to have char arrays, but we now use std::string. Use the correctly API to detect if they are not empty.

<rdar://problem/21090173>

llvm-svn: 238231