Xcode suggested enabling a "no common blocks" warning

(whatever that is) and wanted to clean up some duplicated
entries in the project files.  

llvm-svn: 251586