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
fix libluajia.a search path bug
Merge pull request #3973 from samuele3hu/developSrc

fix libluajia.a search path bug
fix libluajia.a search path bug
Merge pull request #3975 from samuele3hu/developSrc

modify project search path format
Merge pull request #6 from cocos2d/develop

update from cocos2d-x