1. restore android textures fix
1. sleepy mode fix
1. sleepy mode fix
Merge branch 'develop' of https://github.com/ondesly/cocos2d-x into develop

Conflicts:
	cocos/2d/CCTextureCache.cpp
	cocos/2d/platform/android/nativeactivity.cpp