Merge "Do not define JNI_OnLoad for Windows" into main