Merge changes from r298466 into Xcode project

rdar://problem/31197116


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@298517 91177308-0d34-0410-b5e6-96231b3b80d8
1 file changed