handle the redeploy jni loading issue
Merge master/master