updating core for android
Merge branch 'master' into cocos2dx-v2

* master:
  updating core for android

Conflicts:
	build/android/SoomlaAndroidCore.jar