Merge "jni: more O_CLOEXECs"