增加jni库
提交
Merge branch 'master' of https://github.com/msafin/gamevideo

Conflicts:
	android/project.properties