Modify xcode project to fit common reorg.
Merge pull request #543 from zhilwang/reorgcommon-xcode

Modify xcode project to fit common reorg.