issue #2905:simplify Android.mk dependence
Merge pull request #3971 from minggo/iss2905-adjust_folder

issue #2905:simplify Android.mk dependence
fix xcode compiling error and simplify android.mk
Merge pull request #3972 from minggo/iss2905-adjust_folder

fix xcode compiling error and simplify android.mk
issue #2771: edit some mistake when merge
Merge https://github.com/cocos2d/cocos2d-x into iss2771_physical
issue #2771: edit some include head file path