Fixes for ccr.
Merge branch 'ccr' of https://github.com/dumganhar/cocos2d-x into cocosRuntime

Conflicts:
	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
	cocos/platform/android/jni/JniHelper.cpp