Merge "Revert "Avoid JNI usage error when JNI_OnLoad throws""