Resolve conflicts with latest cocos2x/Android.mk