for android
Merge branch 'android' of https://github.com/zhukaixy/cocos3d-x into mergecocos3.0

Conflicts:
	EngineDemo/Classes/FullDemo/FullDemoLayer.cpp
	EngineDemo/Classes/FullDemo/MainPlayer.cpp
	cocos3d/C3DRenderNode.cpp
	cocos3d/C3DRenderSystem.cpp
	cocos3d/C3DSampler.cpp
	cocos3d/C3DSampler.h
	cocos3d/C3DStaticObj.h
	cocos3d/C3DTexture.cpp
	cocos3d/MaterialParameter.cpp