removed android from the main cocos2d build. it has its own project.
Merge remote-tracking branch 'upstream/master'