CCImage for android fix
Merge branch 'master' of github.com:UNSTeam/cocos2d-x

Conflicts:
	cocos2dx/platform/android/CCImage.cpp