issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix.
issue #2905: [iOS, Mac] Updating project configuration, TestCpp works now.
issue #2905: Reverting TestCpp/Android.mk
Merge pull request #3949 from dumganhar/iss2905-folder-structure

issue #2905: [iOS, Mac] Updating project configuration, TestCpp works now.